clean up of disconnect method