Removed doctrine specific functionality (moved to sub-module).