Demo update

+ Remove distracting code from examples.