Cleanup and add final example for creation cleanup