Revert "some demo cleanup"

This reverts commit 0e8d1f88f0e07568a80e696a521fde2464215b94.