Removed some globals