more entity cleanup