Remove old switch and added new one