SONAR-5249 Cleanup