SONARERLNG-15 Remove dead code