Cleaning up the various managers a bit