diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
deleted file mode 100644
index 43181b28..00000000
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- * Copyright (C) 2020 ownCloud GmbH.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.resources.files;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
-import com.owncloud.android.lib.common.network.FileRequestBody;
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import okhttp3.MediaType;
-import timber.log.Timber;
-
-import java.io.File;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the upload of a remote file to the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- * @author David González Verdugo
- */
-
-public class UploadRemoteFileOperation extends RemoteOperation {
-
- protected final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
- protected String mLocalPath;
- protected String mRemotePath;
- protected String mMimeType;
- protected String mFileLastModifTimestamp;
- protected PutMethod mPutMethod = null;
- protected String mRequiredEtag = null;
- protected Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
-
- protected FileRequestBody mFileRequestBody = null;
-
- public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType,
- String fileLastModifTimestamp) {
- mLocalPath = localPath;
- mRemotePath = remotePath;
- mMimeType = mimeType;
- mFileLastModifTimestamp = fileLastModifTimestamp;
- }
-
- public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType,
- String requiredEtag, String fileLastModifTimestamp) {
- this(localPath, remotePath, mimeType, fileLastModifTimestamp);
- mRequiredEtag = requiredEtag;
- }
-
- @Override
- protected RemoteOperationResult run(OwnCloudClient client) {
- RemoteOperationResult result;
-
- try {
-
- if (mCancellationRequested.get()) {
- // the operation was cancelled before getting it's turn to be executed in the queue of uploads
- result = new RemoteOperationResult<>(new OperationCancelledException());
- } else {
- // perform the upload
- result = uploadFile(client);
- Timber.i("Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
- }
-
- } catch (Exception e) {
-
- if (mPutMethod != null && mPutMethod.isAborted()) {
- result = new RemoteOperationResult<>(new OperationCancelledException());
- Timber.e(result.getException(),
- "Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
- } else {
- result = new RemoteOperationResult<>(e);
- Timber.e(e, "Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
- }
- }
-
- return result;
- }
-
- protected RemoteOperationResult<?> uploadFile(OwnCloudClient client) throws Exception {
-
- File fileToUpload = new File(mLocalPath);
-
- MediaType mediaType = MediaType.parse(mMimeType);
-
- mFileRequestBody = new FileRequestBody(fileToUpload, mediaType);
-
- synchronized (mDataTransferListeners) {
- mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
- }
-
- mPutMethod = new PutMethod(
- new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)), mFileRequestBody);
-
- mPutMethod.setRetryOnConnectionFailure(false);
-
- if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
- mPutMethod.addRequestHeader(HttpConstants.IF_MATCH_HEADER, mRequiredEtag);
- }
-
- mPutMethod.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(fileToUpload.length()));
- mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-
- int status = client.executeHttpMethod(mPutMethod);
-
- if (isSuccess(status)) {
- return new RemoteOperationResult<>(OK);
-
- } else { // synchronization failed
- return new RemoteOperationResult<>(mPutMethod);
- }
- }
-
- public Set<OnDatatransferProgressListener> getDataTransferListeners() {
- return mDataTransferListeners;
- }
-
- public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
- synchronized (mDataTransferListeners) {
- mDataTransferListeners.add(listener);
- }
- if (mFileRequestBody != null) {
- mFileRequestBody.addDatatransferProgressListener(listener);
- }
- }
-
- public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
- synchronized (mDataTransferListeners) {
- mDataTransferListeners.remove(listener);
- }
- if (mFileRequestBody != null) {
- mFileRequestBody.removeDatatransferProgressListener(listener);
- }
- }
-
- public void cancel() {
- synchronized (mCancellationRequested) {
- mCancellationRequested.set(true);
- if (mPutMethod != null) {
- mPutMethod.abort();
- }
- }
- }
-
- public boolean isSuccess(int status) {
- return ((status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_CREATED ||
- status == HttpConstants.HTTP_NO_CONTENT));
- }
-}
\ No newline at end of file
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
deleted file mode 100644
index 10b8ea36..00000000
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- * Copyright (C) 2020 ownCloud GmbH.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.resources.files.chunks;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
-import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
-import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
-import okhttp3.MediaType;
-import timber.log.Timber;
-
-import java.io.File;
-import java.io.RandomAccessFile;
-import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.util.concurrent.TimeUnit;
-
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the chunked upload of a remote file to the ownCloud server.
- *
- * @author David A. Velasco
- * @author David González Verdugo
- */
-public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {
-
- public static final long CHUNK_SIZE = 1024000;
- private static final int LAST_CHUNK_TIMEOUT = 900000; //15 mins.
-
- private String mTransferId;
-
- public ChunkedUploadRemoteFileOperation(String transferId, String localPath, String remotePath, String mimeType,
- String requiredEtag, String fileLastModifTimestamp) {
- super(localPath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);
- mTransferId = transferId;
- }
-
- @Override
- protected RemoteOperationResult uploadFile(OwnCloudClient client) throws Exception {
- int status;
- RemoteOperationResult result = null;
- FileChannel channel;
- RandomAccessFile raf;
-
- File fileToUpload = new File(mLocalPath);
- MediaType mediaType = MediaType.parse(mMimeType);
-
- raf = new RandomAccessFile(fileToUpload, "r");
- channel = raf.getChannel();
-
- mFileRequestBody = new ChunkFromFileRequestBody(fileToUpload, mediaType, channel, CHUNK_SIZE);
-
- synchronized (mDataTransferListeners) {
- mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
- }
-
- long offset = 0;
- String uriPrefix = client.getUploadsWebDavUri() + File.separator + mTransferId;
- long totalLength = fileToUpload.length();
- long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
-
- for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
-
- ((ChunkFromFileRequestBody) mFileRequestBody).setOffset(offset);
-
- if (mCancellationRequested.get()) {
- result = new RemoteOperationResult<>(new OperationCancelledException());
- break;
- } else {
- mPutMethod = new PutMethod(
- new URL(uriPrefix + File.separator + chunkIndex), mFileRequestBody);
-
- if (chunkIndex == chunkCount - 1) {
- // Added a high timeout to the last chunk due to when the last chunk
- // arrives to the server with the last PUT, all chunks get assembled
- // within that PHP request, so last one takes longer.
- mPutMethod.setReadTimeout(LAST_CHUNK_TIMEOUT, TimeUnit.MILLISECONDS);
- }
-
- status = client.executeHttpMethod(mPutMethod);
-
- Timber.d("Upload of " + mLocalPath + " to " + mRemotePath +
- ", chunk index " + chunkIndex + ", count " + chunkCount +
- ", HTTP result status " + status);
-
- if (isSuccess(status)) {
- result = new RemoteOperationResult<>(OK);
- } else {
- result = new RemoteOperationResult<>(mPutMethod);
- break;
- }
- }
- }
-
- if (channel != null) {
- channel.close();
- }
-
- if (raf != null) {
- raf.close();
- }
-
- return result;
- }
-}
\ No newline at end of file