Remove some global refs