clean up some accidentally introduced global variables.