more globals removal