Cleanup2

Merged Martin Reinecke requested to merge cleanup2 into master

Merge request reports