[cleanup] sonar