diff --git a/vtkm/cont/VirtualObjectHandle.h b/vtkm/cont/VirtualObjectHandle.h
index 85d08c8f7..7255c9e7a 100644
--- a/vtkm/cont/VirtualObjectHandle.h
+++ b/vtkm/cont/VirtualObjectHandle.h
@@ -134,7 +134,7 @@ public:
   /// 3. Reset or ReleaseResources is called
   ///
   VTKM_CONT const VirtualBaseType* PrepareForExecution(vtkm::cont::DeviceAdapterId deviceId,
-                                                       vtkm::cont::Token& token) const
+                                                       vtkm::cont::Token&) const
   {
     const bool validId = this->Internals->DeviceIdIsValid(deviceId);
     if (!validId)
@@ -143,8 +143,7 @@ public:
       return nullptr;
     }
 
-    return static_cast<const VirtualBaseType*>(
-      this->Internals->PrepareForExecution(deviceId, token));
+    return static_cast<const VirtualBaseType*>(this->Internals->PrepareForExecution(deviceId));
   }
 
   VTKM_CONT
diff --git a/vtkm/cont/internal/VirtualObjectTransfer.h b/vtkm/cont/internal/VirtualObjectTransfer.h
index dd41262a1..adeb571bb 100644
--- a/vtkm/cont/internal/VirtualObjectTransfer.h
+++ b/vtkm/cont/internal/VirtualObjectTransfer.h
@@ -14,7 +14,6 @@
 
 #include <vtkm/VirtualObjectBase.h>
 #include <vtkm/cont/DeviceAdapterTag.h>
-#include <vtkm/cont/Token.h>
 
 #include <array>
 #include <memory>
@@ -46,8 +45,7 @@ struct VirtualObjectTransfer
   /// PrepareForExecution). If the \c updateData flag is false and the object was already
   /// transferred previously, the previously created object is returned.
   ///
-  VTKM_CONT const VirtualDerivedType* PrepareForExecution(bool updateData,
-                                                          vtkm::cont::Token& token);
+  VTKM_CONT const VirtualDerivedType* PrepareForExecution(bool updateData);
 
   /// \brief Frees up any resources in the execution environment.
   ///
@@ -64,8 +62,7 @@ public:
   VTKM_CONT virtual ~TransferInterface();
 
   VTKM_CONT virtual const vtkm::VirtualObjectBase* PrepareForExecution(
-    vtkm::Id hostModifiedCount,
-    vtkm::cont::Token& token) = 0;
+    vtkm::Id hostModifiedCount) = 0;
   VTKM_CONT virtual void ReleaseResources() = 0;
 };
 
@@ -79,12 +76,10 @@ public:
   {
   }
 
-  VTKM_CONT const vtkm::VirtualObjectBase* PrepareForExecution(vtkm::Id hostModifiedCount,
-                                                               vtkm::cont::Token& token) override
+  VTKM_CONT const vtkm::VirtualObjectBase* PrepareForExecution(vtkm::Id hostModifiedCount) override
   {
     bool updateData = (this->LastModifiedCount != hostModifiedCount);
-    const vtkm::VirtualObjectBase* executionObject =
-      this->Transfer.PrepareForExecution(updateData, token);
+    const vtkm::VirtualObjectBase* executionObject = this->Transfer.PrepareForExecution(updateData);
     this->LastModifiedCount = hostModifiedCount;
     return executionObject;
   }
@@ -144,13 +139,12 @@ struct VTKM_CONT_EXPORT TransferState
     }
   }
 
-  const vtkm::VirtualObjectBase* PrepareForExecution(vtkm::cont::DeviceAdapterId deviceId,
-                                                     vtkm::cont::Token& token) const
+  const vtkm::VirtualObjectBase* PrepareForExecution(vtkm::cont::DeviceAdapterId deviceId) const
   {
     //make sure the device is up to date
     auto index = static_cast<std::size_t>(deviceId.GetValue());
     vtkm::Id count = this->HostPointer->GetModifiedCount();
-    return this->DeviceTransferState[index]->PrepareForExecution(count, token);
+    return this->DeviceTransferState[index]->PrepareForExecution(count);
   }
 
   vtkm::VirtualObjectBase* HostPtr() const { return this->HostPointer; }
diff --git a/vtkm/cont/internal/VirtualObjectTransferShareWithControl.h b/vtkm/cont/internal/VirtualObjectTransferShareWithControl.h
index 35570cdae..49f8480db 100644
--- a/vtkm/cont/internal/VirtualObjectTransferShareWithControl.h
+++ b/vtkm/cont/internal/VirtualObjectTransferShareWithControl.h
@@ -13,8 +13,6 @@
 #include <vtkm/StaticAssert.h>
 #include <vtkm/VirtualObjectBase.h>
 
-#include <vtkm/cont/Token.h>
-
 namespace vtkm
 {
 namespace cont
@@ -30,8 +28,7 @@ struct VirtualObjectTransferShareWithControl
   {
   }
 
-  VTKM_CONT const VirtualDerivedType* PrepareForExecution(bool vtkmNotUsed(updateData),
-                                                          vtkm::cont::Token&)
+  VTKM_CONT const VirtualDerivedType* PrepareForExecution(bool vtkmNotUsed(updateData))
   {
     return this->VirtualObject;
   }
diff --git a/vtkm/cont/testing/TestingDeviceAdapter.h b/vtkm/cont/testing/TestingDeviceAdapter.h
index ec7897d86..8149259e0 100644
--- a/vtkm/cont/testing/TestingDeviceAdapter.h
+++ b/vtkm/cont/testing/TestingDeviceAdapter.h
@@ -627,9 +627,7 @@ private:
     target.Value = 5;
 
     Transfer transfer(&target);
-    vtkm::cont::Token transferToken;
-    const BaseType* base =
-      static_cast<const BaseType*>(transfer.PrepareForExecution(false, transferToken));
+    const BaseType* base = static_cast<const BaseType*>(transfer.PrepareForExecution(false));
 
     {
       vtkm::cont::Token token;
@@ -640,7 +638,7 @@ private:
     {
       vtkm::cont::Token token;
       target.Value = 10;
-      base = static_cast<const BaseType*>(transfer.PrepareForExecution(true, token));
+      base = static_cast<const BaseType*>(transfer.PrepareForExecution(true));
       Algorithm::Schedule(VirtualObjectTransferKernel(base, result, token), 1);
     }
     VTKM_TEST_ASSERT(result.GetPortalConstControl().Get(0) == 10, "Did not get expected result");