More action on removing globals