refactor for sonar
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Keep calm and  only delete my added entities