Changed disconnect() calls to be symmetric to connect().