Patch to USSD branch - eliminates static variables