Code cleanup

Closes #3511121

Merge request reports

Loading