Removing the switch for now