Remove global references from our code.