remove more demo cruft