Weeding out more globals