#543 floorplan cleanup