More Sonar cleanups