Clean up some of the globals