Remove unneeded case blocks