Remove Room Handler

Please do review. Thakns!