Method is now named disconnect
Minor clean up