Add cleanup for rooms