SONAR-4100 Remove useless code