Further cleaning up of entities.