Code cleanup and fix delete call

Merged Vadim Seregin requested to merge seregin/ECM:CLEANUP_5192023 into master

code cleanup and fix delete call

Merge request reports