SONAR-4923 Remove no more used code
Fix quality flaws