Refs #9568. Uncomment accidentally commented clean-up code
Merge branch 'feature/9568_docs_and_usage_examples' into develop