Cleanup code

Stefan Borchertrequested to merge
feature/cleanup into 10.0.x

Signed-off-by: Stefan Borchert stefan@undpaul.de

Merge request reports