Clean-up

Merged Amir MOHAMMADI requested to merge cleanup into master

Merge request reports