Moved demo code aside from evolutility code.
Cleanup.