Remove switchMutex since its no longer required
Tweak ciper messages - closes #905