Switch (and wall) removal no longer crashes the editor, another related bug found