Remove usage of deprecated entity.manager service