clean up of handling otrswitch state