Cleanup

Merged Alex Iribarren requested to merge cleanup into master

Merge request reports