Cleaned up demos