Updated onDestroy, added Disconnect