diff --git a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheAction.java b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheAction.java
index efaf0259398..b381fe36768 100644
--- a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheAction.java
+++ b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheAction.java
@@ -6,7 +6,6 @@
 package org.elasticsearch.shield.action.authc.cache;
 
 import org.elasticsearch.action.Action;
-import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.ElasticsearchClient;
 
 /**
diff --git a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequest.java b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequest.java
index 47c8c0b4c0f..b11185b3ecf 100644
--- a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequest.java
+++ b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequest.java
@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.action.authc.cache;
 
-import org.elasticsearch.action.support.nodes.NodeOperationRequest;
-import org.elasticsearch.action.support.nodes.NodesOperationRequest;
+import org.elasticsearch.action.support.nodes.BaseNodeRequest;
+import org.elasticsearch.action.support.nodes.BaseNodesRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -15,7 +15,7 @@ import java.io.IOException;
 /**
  *
  */
-public class ClearRealmCacheRequest extends NodesOperationRequest<ClearRealmCacheRequest> {
+public class ClearRealmCacheRequest extends BaseNodesRequest<ClearRealmCacheRequest> {
 
     String[] realms;
     String[] usernames;
@@ -84,7 +84,7 @@ public class ClearRealmCacheRequest extends NodesOperationRequest<ClearRealmCach
         out.writeStringArrayNullable(usernames);
     }
 
-    static class Node extends NodeOperationRequest {
+    static class Node extends BaseNodeRequest {
 
         String[] realms;
         String[] usernames;
diff --git a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequestBuilder.java b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequestBuilder.java
index b98ea9b7c27..c6af4fe2aca 100644
--- a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheRequestBuilder.java
@@ -5,10 +5,7 @@
  */
 package org.elasticsearch.shield.action.authc.cache;
 
-import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.ElasticsearchClient;
 import org.elasticsearch.shield.client.ShieldAuthcClient;
 import org.elasticsearch.shield.client.ShieldClient;
diff --git a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheResponse.java b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheResponse.java
index 0ecbb68f372..cb48869894d 100644
--- a/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheResponse.java
+++ b/src/main/java/org/elasticsearch/shield/action/authc/cache/ClearRealmCacheResponse.java
@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.shield.action.authc.cache;
 
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
-import org.elasticsearch.action.support.nodes.NodesOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
+import org.elasticsearch.action.support.nodes.BaseNodesResponse;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -20,7 +20,7 @@ import java.io.IOException;
 /**
  *
  */
-public class ClearRealmCacheResponse extends NodesOperationResponse<ClearRealmCacheResponse.Node> implements ToXContent {
+public class ClearRealmCacheResponse extends BaseNodesResponse<ClearRealmCacheResponse.Node> implements ToXContent {
 
     public ClearRealmCacheResponse() {
     }
@@ -72,7 +72,7 @@ public class ClearRealmCacheResponse extends NodesOperationResponse<ClearRealmCa
         }
     }
 
-    public static class Node extends NodeOperationResponse {
+    public static class Node extends BaseNodeResponse {
 
         Node() {
         }
diff --git a/src/main/java/org/elasticsearch/shield/action/authc/cache/TransportClearRealmCacheAction.java b/src/main/java/org/elasticsearch/shield/action/authc/cache/TransportClearRealmCacheAction.java
index f9ab35adfa0..4156b847103 100644
--- a/src/main/java/org/elasticsearch/shield/action/authc/cache/TransportClearRealmCacheAction.java
+++ b/src/main/java/org/elasticsearch/shield/action/authc/cache/TransportClearRealmCacheAction.java
@@ -7,7 +7,7 @@ package org.elasticsearch.shield.action.authc.cache;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
+import org.elasticsearch.action.support.nodes.TransportNodesAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.common.collect.Lists;
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public class TransportClearRealmCacheAction extends TransportNodesOperationAction<ClearRealmCacheRequest, ClearRealmCacheResponse, ClearRealmCacheRequest.Node, ClearRealmCacheResponse.Node> {
+public class TransportClearRealmCacheAction extends TransportNodesAction<ClearRealmCacheRequest, ClearRealmCacheResponse, ClearRealmCacheRequest.Node, ClearRealmCacheResponse.Node> {
 
     private final Realms realms;
 
diff --git a/src/main/java/org/elasticsearch/shield/client/ShieldAuthcClient.java b/src/main/java/org/elasticsearch/shield/client/ShieldAuthcClient.java
index 1d73c6341c1..6ea64344b2c 100644
--- a/src/main/java/org/elasticsearch/shield/client/ShieldAuthcClient.java
+++ b/src/main/java/org/elasticsearch/shield/client/ShieldAuthcClient.java
@@ -7,7 +7,6 @@ package org.elasticsearch.shield.client;
 
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.ElasticsearchClient;
 import org.elasticsearch.shield.action.authc.cache.ClearRealmCacheAction;
 import org.elasticsearch.shield.action.authc.cache.ClearRealmCacheRequest;