Removed old globals