Sonar clean ups.