Demo cleanup#163

sproctor wants to merge 4 commits into

ehsannarmani:masterehsannarmani/ComposeCharts:masterfrom

sproctor:demo_cleanupsproctor/ComposeCharts:demo_cleanupCopy head branch name to clipboard