Get rid of some long lasting globals that we never really needed.