Improve remove

Merged Stefano Capitani requested to merge security into master

Merge request reports