Causing to much problems... Revert "Restore roomservice..."

This reverts commit 6482da5c935f490ed56ff8d7010ec888e6b9dece.