Initial cleanup

Still need to pull out a whole bunch of 'demo' related stuff, and settle on an API.