Get rid of grep checks for Object::disconnect