diff --git a/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java b/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java
index fea39af40e..72f212573a 100644
--- a/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java
+++ b/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java
@@ -75,8 +75,8 @@ public RegisterAccountDeviceForNotificationsOperation(String pushTokenHash, Stri
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status = -1;
+        RemoteOperationResult result;
+        int status;
         PushResponse pushResponse;
         PostMethod post = null;
 
@@ -109,11 +109,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                     result = new RemoteOperationResult(false, status, post.getResponseHeaders());
                 }
             }
-
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while registering device for notifications", e);
-
         } finally {
             if (post != null) {
                 post.releaseConnection();
diff --git a/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForProxyOperation.java b/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForProxyOperation.java
index 2f6a536163..a964cec32d 100644
--- a/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForProxyOperation.java
+++ b/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForProxyOperation.java
@@ -26,17 +26,19 @@
  */
 package com.owncloud.android.lib.resources.notifications;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.PostMethod;
 
 import java.net.URLEncoder;
 
-public class RegisterAccountDeviceForProxyOperation extends RemoteOperation {
+import static com.owncloud.android.lib.common.operations.RemoteOperation.CONTENT_TYPE;
+import static com.owncloud.android.lib.common.operations.RemoteOperation.FORM_URLENCODED;
+
+public class RegisterAccountDeviceForProxyOperation {
     private static final String PROXY_ROUTE = "/devices";
 
     private static final String TAG = RegisterAccountDeviceForProxyOperation.class.getSimpleName();
@@ -62,10 +64,9 @@ public RegisterAccountDeviceForProxyOperation(String proxyUrl, String pushToken,
         this.userPublicKey = userPublicKey;
     }
 
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status = -1;
+    public RemoteOperationResult run() {
+        RemoteOperationResult result;
+        int status;
         PostMethod post = null;
 
         try {
@@ -77,13 +78,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             uriToPost += USER_PUBLIC_KEY + "=" + URLEncoder.encode(userPublicKey);
 
             post = new PostMethod(uriToPost);
-            post.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-
             post.setRequestHeader(CONTENT_TYPE, FORM_URLENCODED);
             
-            client.clearCredentials();
-
-            status = client.executeMethod(post);
+            status = new HttpClient().executeMethod(post);
             String response = post.getResponseBodyAsString();
 
             if(isSuccess(status)) {
diff --git a/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForProxyOperation.java b/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForProxyOperation.java
index 311e86a045..8edec5d3a7 100644
--- a/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForProxyOperation.java
+++ b/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForProxyOperation.java
@@ -26,17 +26,19 @@
  */
 package com.owncloud.android.lib.resources.notifications;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.HttpDeleteWithBody;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;
 
 import java.net.URLEncoder;
 
-public class UnregisterAccountDeviceForProxyOperation extends RemoteOperation {
+import static com.owncloud.android.lib.common.operations.RemoteOperation.CONTENT_TYPE;
+import static com.owncloud.android.lib.common.operations.RemoteOperation.FORM_URLENCODED;
+
+public class UnregisterAccountDeviceForProxyOperation {
     private static final String PROXY_ROUTE = "/devices";
 
     private static final String TAG = RegisterAccountDeviceForProxyOperation.class.getSimpleName();
@@ -59,10 +61,9 @@ public UnregisterAccountDeviceForProxyOperation(String proxyUrl, String deviceId
         this.userPublicKey = userPublicKey;
     }
 
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status = -1;
+    public RemoteOperationResult run() {
+        RemoteOperationResult result;
+        int status;
         HttpDeleteWithBody delete = null;
 
         try {
@@ -73,12 +74,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             uriToPost += USER_PUBLIC_KEY + "=" + URLEncoder.encode(userPublicKey);
 
             delete = new HttpDeleteWithBody(uriToPost);
-            delete.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
             delete.setRequestHeader(CONTENT_TYPE, FORM_URLENCODED);
 
-            client.clearCredentials();
-
-            status = client.executeMethod(delete);
+            status = new HttpClient().executeMethod(delete);
             String response = delete.getResponseBodyAsString();
 
             if(isSuccess(status)) {