More Entity Cleanup