#125 cleanup of examples.