Cleanup more globals.