Remove switch

Going to make the switch available through the list