Resolve "clean up"

Merge request reports