diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
index 1a41cf1ab1d6a2bb83d134400bbfbbe614459663..0f67590039eff3c81ec0bcc39117ccd3b065a74f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
@@ -60,11 +60,6 @@ import de.schlichtherle.io.FileOutputStream;
 public class DssServiceRpcGeneric extends AbstractDssServiceRpc<IDssServiceRpcGenericInternal>
         implements IDssServiceRpcGenericInternal
 {
-    /**
-     * The sub-directory in the session workspace reserved for clients to drop files.
-     */
-    private static final String CLIENT_DROP_SUB_DIR = "clientDrop";
-
     /**
      * Logger with {@link LogCategory#OPERATION} with name of the concrete class, needs to be static
      * for our purpose.
@@ -212,7 +207,7 @@ public class DssServiceRpcGeneric extends AbstractDssServiceRpc<IDssServiceRpcGe
         final File workspaceDir =
                 new SessionWorkspaceProvider(sessionWorkspaceRootDirectory, sessionToken)
                         .getSessionWorkspace();
-        final File dir = new File(workspaceDir, FilenameUtils.concat(CLIENT_DROP_SUB_DIR, subDir));
+        final File dir = new File(workspaceDir, subDir);
         dir.mkdirs();
         final File file = new File(dir, filename);
         OutputStream ostream = null;
@@ -242,7 +237,7 @@ public class DssServiceRpcGeneric extends AbstractDssServiceRpc<IDssServiceRpcGe
         final File workspaceDir =
                 new SessionWorkspaceProvider(sessionWorkspaceRootDirectory, sessionToken)
                         .getSessionWorkspace();
-        final File file = new File(workspaceDir, FilenameUtils.concat(CLIENT_DROP_SUB_DIR, path));
+        final File file = new File(workspaceDir, path);
         FileUtilities.deleteRecursively(file);
         return file.exists() == false;
     }