Cleanup. Broke out Demo, Perf separately. Brief writeup.