Removed dependency on doctrine / doctrine-bundle