Removed unecessary static locals