Cleaning up demos for new functionality