More cleaning of examples