Many more rogue entities removed. Almost compiles now... just a few dozen more commits...