Removed class global variables