Clean up.  Removed unneeded files and fixed demo