More rogue entities removed or added. None of this is 2.4.3 compliant.