remove un-needed globals