Simplify all switches

Removes redundant code

Change-Id: I94279ddbe54aff2bdccbc0c77e41638de9ad4fc5