Remove some useless default switch statements