Remove reference to room_id