Remove extraneous globals