Removed cruft I didn't intend to commit to the demo :-/