Removed some global variables.