Disabling and deleting rooms and supplements improved