Cleanup of a few more globals