Entity-Mapping Doctrine clean up