Fixing Sonar Issues, removed ModifyRegistry class