Remove switch for now