Clean up ElasticaEntityMappingPass
Add annotations to Factory