MEP12: Example clean-up for reference

This PR is meant as a reference for clean-ups that should take place as part of the Gallery clean ups outlined in MEP12.