some more globals gone