Significantly clean up demo