diff --git a/lib/build/rpc_definitions.py b/lib/build/rpc_definitions.py
index 17f61a276d19507098c6fa40f24f7c0694d20e7a..b3f183e710929e434bad7d5881a132e8059e66de 100644
--- a/lib/build/rpc_definitions.py
+++ b/lib/build/rpc_definitions.py
@@ -343,5 +343,6 @@ _MISC_CALLS = [
 
 CALLS = {
   "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS + _NODE_CALLS +
-    _FILE_STORAGE_CALLS + _MISC_CALLS + _INSTANCE_CALLS + _BLOCKDEV_CALLS),
+    _FILE_STORAGE_CALLS + _MISC_CALLS + _INSTANCE_CALLS + _BLOCKDEV_CALLS +
+    _STORAGE_CALLS),
   }
diff --git a/lib/rpc.py b/lib/rpc.py
index aef57078eb80f06334d27ceecb0deb6be7ba4fa5..e4b8507f0a0d59c489ee00df300c2cc50b7b01d0 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -625,36 +625,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
   # Begin RPC calls
   #
 
-  @_RpcTimeout(_TMO_NORMAL)
-  def call_storage_list(self, node_list, su_name, su_args, name, fields):
-    """Get list of storage units.
-
-    This is a multi-node call.
-
-    """
-    return self._MultiNodeCall(node_list, "storage_list",
-                               [su_name, su_args, name, fields])
-
-  @_RpcTimeout(_TMO_NORMAL)
-  def call_storage_modify(self, node, su_name, su_args, name, changes):
-    """Modify a storage unit.
-
-    This is a single-node call.
-
-    """
-    return self._SingleNodeCall(node, "storage_modify",
-                                [su_name, su_args, name, changes])
-
-  @_RpcTimeout(_TMO_NORMAL)
-  def call_storage_execute(self, node, su_name, su_args, name, op):
-    """Executes an operation on a storage unit.
-
-    This is a single-node call.
-
-    """
-    return self._SingleNodeCall(node, "storage_execute",
-                                [su_name, su_args, name, op])
-
   @_RpcTimeout(_TMO_NORMAL)
   def call_instance_start(self, node, instance, hvp, bep, startup_paused):
     """Starts an instance.