Adding cleanup for sonar fixes