Cleanup2

Martin Reinecke requested to merge cleanup2 into NIFTy_4

Merge request reports