Added TearDown on Disconnect

Change-Id: I823a487b1403ae719be893f68f2e92c7cfacd996
Signed-off-by: Andrey Shamis <lolnik@gmail.com>