some more globals are gone