sonar: avoid commented-out lines of code