revert few sonar fixes