Remove duplicate disconnect logic