Sonar Cleanups