Removed the last of the globals