Clean up some application-scope fields