cleanup, sonar