Remove dependency on deprecated SONAR API