More fixes, remove old demo.html file