Remove test switch