- further cleanup of examples