Cleaning up the managers some more.

Still need to change the ORM and fix the profiler.