Remove more references to the Globals option