diff --git a/src/datastore_mad/one_datastore.rb b/src/datastore_mad/one_datastore.rb
index 2ed7afc99b..f06270b6b7 100755
--- a/src/datastore_mad/one_datastore.rb
+++ b/src/datastore_mad/one_datastore.rb
@@ -44,7 +44,6 @@ class DatastoreDriver < OpenNebulaDriver
 
     # Image Driver Protocol constants
     ACTION = {
-        :mv   => "MV",
         :cp   => "CP",
         :rm   => "RM",
         :mkfs => "MKFS",
@@ -77,7 +76,6 @@ class DatastoreDriver < OpenNebulaDriver
             @types = ds_type
         end
 
-#        register_action(ACTION[:mv].to_sym, method("mv"))
         register_action(ACTION[:cp].to_sym, method("cp"))
         register_action(ACTION[:rm].to_sym, method("rm"))
         register_action(ACTION[:mkfs].to_sym, method("mkfs"))
@@ -86,10 +84,6 @@ class DatastoreDriver < OpenNebulaDriver
     ############################################################################
     # Image Manager Protocol Actions (generic implementation)
     ############################################################################
-# TODO: Integrate this with TM
-#    def mv(id, ds, src, dst)
-#        do_image_action(id, ds, :mv, "'#{src}' '#{dst}' '#{id}'")
-#    end
 
     def cp(id, drv_message)
         ds = get_ds_type(drv_message)
@@ -130,8 +124,6 @@ class DatastoreDriver < OpenNebulaDriver
 
         result, info = get_info_from_execution(rc)
 
-
-        PP.pp([ACTION[action], result, id, info],STDERR)
         send_message(ACTION[action], result, id, info)
     end