Added more useless default cases in switch statements