Clean up of examples
Example cleanup