more clean up after moving globals