Cleaning up the ORM manager a bit.