Removed old globals code