Cleaning up, rooms now called channels