Remove some globals