Removed procedures and the entity manager. Other small updates to other
classes.