further cleanup of examples