minor cleanups

* removed some commented out code
* made the --demo option work properly again