Remove useless blocks in switch/case

Remove unnecessary additional blocks.