Removing outdated switch component