diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
index b936269b607d3fc0926c18608a94f549440d35df..1671f2bb01c088c41daab4b4a87675af18123292 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
@@ -52,7 +52,6 @@ import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dat
 import ch.systemsx.cisd.openbis.dss.generic.shared.ArchiverTaskContext;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IDataSetDirectoryProvider;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
-import ch.systemsx.cisd.openbis.dss.generic.shared.IShareFinder;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IShareIdManager;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IUnarchivingPreparation;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IncomingShareIdProvider;
@@ -366,12 +365,6 @@ public class MultiDataSetArchiver extends AbstractArchiverProcessingPlugin
         return scratchShare;
     }
 
-    @Override
-    protected IShareFinder getShareFinder()
-    {
-        return new MultiDataSetArchiverShareFinder();
-    }
-
     public static class MultiDataSetUnarchivingPreparations implements IUnarchivingPreparation
     {
         private final Share scratchShare;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverShareFinder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverShareFinder.java
deleted file mode 100644
index 6bf6ed7b4e202940b1618ca8d438a8e367252dab..0000000000000000000000000000000000000000
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverShareFinder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2014 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
-
-import java.util.List;
-
-import ch.systemsx.cisd.openbis.dss.generic.shared.IShareFinder;
-import ch.systemsx.cisd.openbis.dss.generic.shared.utils.Share;
-import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO;
-
-/**
- * @author Jakub Straszewski
- */
-public class MultiDataSetArchiverShareFinder implements IShareFinder
-{
-    private Share share;
-
-    public MultiDataSetArchiverShareFinder()
-    {
-    }
-
-    @Override
-    public Share tryToFindShare(SimpleDataSetInformationDTO dataSet, List<Share> shares)
-    {
-        if (share == null)
-        {
-            share = tryToFindShare(shares);
-        }
-        return share;
-    }
-
-    public Share tryToFindShare(List<Share> shares)
-    {
-        for (Share sh : shares)
-        {
-            if (sh.isUnarchivingScratchShare())
-            {
-                return sh;
-            }
-        }
-        throw new IllegalArgumentException("Could not find proper share");
-    }
-}