Remove some cruft from demo