Cleanups for namespaces and manager controllers.