beginning long-needed cleanup of examples