Remove EntityMap and use entity managers directly