Overall cleanup of examples.