Removed old switch method