Fix sonar violations: switch statements with no default, duplicate literals, commented out code