Code cleanup.

Closes #3560885

Merge request reports

Loading