Additional clean up of RoomViewController