Eliminate last major Sonar issue