Cleanup to entity mixins before part 11.