Remove injection of entity manager
Remove old methods