Revert "Revert "kill roomservice""

This reverts commit 35308c2d32c5c660efa2b4d1f8fc7fa10fe7bd7d.