removing more globals;