Removing ORM specific features to allow MongoDB ODM usage
Cleaning up Doctrine implementation, minor cleanups