sonar related clean up