[CLEAN] clean code

Merged Leandro Martinek requested to merge 7.0-clean into 7.0-stage

Merge request reports