Cleared Sonar Major findings for commented-out lines of code that should...

... be removed.