Remove switch cloning complexity.