diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ArchiverTaskContext.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ArchiverTaskContext.java
deleted file mode 100644
index 0bfd188ea1365aa783ecb9a4c69952deb8dfcc9e..0000000000000000000000000000000000000000
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ArchiverTaskContext.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011 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.tasks;
-
-import ch.systemsx.cisd.openbis.dss.generic.shared.IDataSetDirectoryProvider;
-
-/**
- * Context for perfoming archiving/unarchiving.
- *
- * @author Franz-Josef Elmer
- */
-public class ArchiverTaskContext
-{
- private final IDataSetDirectoryProvider directoryProvider;
-
- public ArchiverTaskContext(IDataSetDirectoryProvider directoryProvider)
- {
- this.directoryProvider = directoryProvider;
- }
-
- public IDataSetDirectoryProvider getDirectoryProvider()
- {
- return directoryProvider;
- }
-}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IArchiverPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IArchiverPlugin.java
deleted file mode 100644
index 267efb1eea9ab1245f1c60512b32979a73a60e12..0000000000000000000000000000000000000000
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IArchiverPlugin.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2009 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.tasks;
-
-import java.io.Serializable;
-import java.util.List;
-
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DeletedDataSet;
-import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
-
-/**
- * Interface of the archiver task.
- *
- * @author Piotr Buczek
- * @author Kaloyan Enimanev
- */
-public interface IArchiverPlugin extends Serializable
-{
- /**
- * Asynchronously processes archiving of the specified datasets.
- *
- * @returns {@link ProcessingStatus} of the finished processing with statuses of processing for
- * all scheduled data sets or null if processing succeeded for all datasets and no
- * additional information is provided.
- */
- ProcessingStatus archive(List<DatasetDescription> datasets, ArchiverTaskContext context,
- boolean removeFromDataStore);
-
- /**
- * Asynchronously processes unarchiving of the specified datasets.
- *
- * @returns {@link ProcessingStatus} of the finished processing with statuses of processing for
- * all scheduled data sets or null if processing succeeded for all datasets and no
- * additional information is provided.
- */
- ProcessingStatus unarchive(List<DatasetDescription> datasets, ArchiverTaskContext context);
-
- /**
- * Delete data sets from the archive.
- *
- * @returns {@link ProcessingStatus} containing the deletion statuses for all data sets or null
- * if processing succeeded for all datasets and no additional information is provided.
- */
- ProcessingStatus deleteFromArchive(List<DeletedDataSet> datasets);
-}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ProcessingStatus.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ProcessingStatus.java
deleted file mode 100644
index ec6c1daf63e61d1e9b6b022d988764415850fd8e..0000000000000000000000000000000000000000
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ProcessingStatus.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2010 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.tasks;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import ch.systemsx.cisd.common.exceptions.Status;
-import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
-
-/**
- * Holder of finished processing {@link Status}es of all handled data sets.
- *
- * @author Piotr Buczek
- */
-public class ProcessingStatus
-{
-
- private Map<Status, List<String/* dataset code */>> datasetByStatus =
- new LinkedHashMap<Status, List<String>>();
-
- public void addDatasetStatus(String datasetCode, Status status)
- {
- List<String> datasets = datasetByStatus.get(status);
- if (datasets == null)
- {
- datasets = new ArrayList<String>();
- datasetByStatus.put(status, datasets);
- }
- datasets.add(datasetCode);
- }
-
- public List<Status> getErrorStatuses()
- {
- List<Status> result = new ArrayList<Status>(datasetByStatus.keySet());
- result.remove(Status.OK);
- return result;
- }
-
- public List<String/* dataset code */> getDatasetsByStatus(Status status)
- {
- return datasetByStatus.get(status);
- }
-
- public void addDatasetStatus(DatasetDescription dataset, Status status)
- {
- addDatasetStatus(dataset.getDatasetCode(), status);
- }
-
- public Status tryGetStatusByDataset(String datasetCode)
- {
- for (Entry<Status, List<String>> entry : datasetByStatus.entrySet())
- {
- if (entry.getValue().contains(datasetCode))
- {
- return entry.getKey();
- }
- }
- return null;
- }
-
-}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDeleterProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDeleterProvider.java
deleted file mode 100644
index 9bee8d439ffd2997fd3f92b8c2e044d1655e117b..0000000000000000000000000000000000000000
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDeleterProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011 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.shared;
-
-/**
- * A provider of {@link IDataSetDeleter}.
- *
- * @author Kaloyan Enimanev
- */
-public interface IDataSetDeleterProvider
-{
- /**
- * Return an {@link IDataSetDeleter} instance.
- */
- IDataSetDeleter getDataSetDeleter();
-}
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java
index 62cd7b6cdd6b9128c5f4fe92ac676bd41325ca57..fb7f9d048cd1c617ea1493e3691ca96ffb50af6a 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java
@@ -39,9 +39,9 @@ import ch.systemsx.cisd.common.mail.EMailAddress;
import ch.systemsx.cisd.common.utilities.MD5ChecksumCalculator;
import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ProcessingStatus;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.ProcessingStatus;
import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
diff --git a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java
index 2bc563aae31f1b590ed22f10355ee1b9fbea2b55..0f83b29031c25f90c8150db89faab2126773867a 100644
--- a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java
+++ b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java
@@ -46,9 +46,9 @@ import ch.systemsx.cisd.common.test.RecordingMatcher;
import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.MockDataSetDirectoryProvider;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ProcessingStatus;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.ProcessingStatus;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
diff --git a/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesPropertiesUpdateProcessingPlugin.java b/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesPropertiesUpdateProcessingPlugin.java
index 8cfb71a8cbba9a262c2e910d5ae82dc33a06306b..2f366534aa1f814d7dc31234c92ccd65db75d15f 100644
--- a/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesPropertiesUpdateProcessingPlugin.java
+++ b/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesPropertiesUpdateProcessingPlugin.java
@@ -24,9 +24,9 @@ import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractDatastorePlugin;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ProcessingStatus;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
import ch.systemsx.cisd.openbis.dss.generic.shared.IDataSetDirectoryProvider;
+import ch.systemsx.cisd.openbis.dss.generic.shared.ProcessingStatus;
import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
import ch.systemsx.cisd.openbis.generic.shared.dto.NewProperty;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java
index faa32c225aa3504d9a838e4b212d01a565a1064a..f0d33bf686ade121793b1b1bbeb51a6431b4be53 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java
@@ -29,8 +29,8 @@ import ch.systemsx.cisd.openbis.dss.etl.HCSImageDatasetLoaderFactory;
import ch.systemsx.cisd.openbis.dss.etl.IContentRepository;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractDatastorePlugin;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ProcessingStatus;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
+import ch.systemsx.cisd.openbis.dss.generic.shared.ProcessingStatus;
import ch.systemsx.cisd.openbis.dss.shared.DssScreeningUtils;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.IImagingReadonlyQueryDAO;