Remove unused code
Fix ordering bugs

To terminate an example, use org.onspec.Done event, just like the
clients do.