Moved cleaning. Output seems to be much better. This refs #8045
Added geometry switch. This resolves #8045
Merge remote-tracking branch 'origin/feature/8045_moving_cleaning_function'