Cleaning up demos