Revert "add back room mgr stuff"

This reverts commit 83eaf737720471d474bef4a2ce2b0c41d36a52b3.