Fix [SonarQube] Avoid commented-out lines of code