Cleanup of entity stuff, a start at reverse relationships on entity fields but it needs to be finished.