Improve disconnect flow