Cleanup in EntitiesByPropertyValue