Removed more globals