Remove some old globals