Removed Globals.h and other general cleanup.