Remove dependency on Doctrine ORM