refs #8428. Move cleanup to separate method.
Merge branch 'feature/8428_reporting' into develop