Removed spurious switch