diff --git a/hpvm/lib/Transforms/GenVISC/GenVISC.cpp b/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
index cd711b4a7d3d05d9870bfc638aff1a793f7dbcc6..cae0b3a2dcbd5ad3a0ff6dfdaf99dc2b3eaefbf0 100644
--- a/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
+++ b/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
@@ -163,21 +163,6 @@ IS_VISC_CALL(requestMemory)
 IS_VISC_CALL(attributes)
 IS_VISC_CALL(hint)
 
-// Tensor Operators
-IS_VISC_CALL(tensor_mul)
-IS_VISC_CALL(tensor_convolution)
-IS_VISC_CALL(tensor_group_convolution)
-IS_VISC_CALL(tensor_batchnorm)
-IS_VISC_CALL(tensor_add)
-IS_VISC_CALL(tensor_pool_max)
-IS_VISC_CALL(tensor_pool_min)
-IS_VISC_CALL(tensor_pool_mean)
-IS_VISC_CALL(tensor_relu)
-IS_VISC_CALL(tensor_clipped_relu)
-IS_VISC_CALL(tensor_tanh)
-IS_VISC_CALL(tensor_sigmoid)
-IS_VISC_CALL(tensor_softmax)
-
 // Return the constant integer represented by value V
 static unsigned getNumericValue(Value* V) {
   assert(isa<ConstantInt>(V)
@@ -1282,42 +1267,6 @@ bool GenVISC::runOnModule(Module &M) {
       if (isVISCCall_cos(I)) {
         ReplaceCallWithIntrinsic(I, Intrinsic::cos, &toBeErased);
       }
-      if (isVISCCall_tensor_convolution(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_convolution, &toBeErased);
-      }
-      if (isVISCCall_tensor_group_convolution(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_group_convolution, &toBeErased);
-      }
-      if (isVISCCall_tensor_add(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_add, &toBeErased);
-      }
-      if (isVISCCall_tensor_batchnorm(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_batchnorm, &toBeErased);
-      }
-      if (isVISCCall_tensor_mul(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_mul, &toBeErased);
-      }
-      if (isVISCCall_tensor_pool_max(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_pool_max, &toBeErased);
-      }
-      if (isVISCCall_tensor_pool_min(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_pool_min, &toBeErased);
-      }
-      if (isVISCCall_tensor_pool_mean(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_pool_mean, &toBeErased);
-      }
-      if (isVISCCall_tensor_relu(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_relu, &toBeErased);
-      }
-      if (isVISCCall_tensor_tanh(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_tanh, &toBeErased);
-      }
-      if (isVISCCall_tensor_clipped_relu(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_clipped_relu, &toBeErased);
-      }
-      if (isVISCCall_tensor_softmax(I)) {
-        ReplaceCallWithIntrinsic(I, Intrinsic::visc_tensor_softmax, &toBeErased);
-      }
     }
 
     // Erase the __visc__node calls