diff --git a/llvm/lib/Transforms/Yk/ControlPoint.cpp b/llvm/lib/Transforms/Yk/ControlPoint.cpp
index 2a93f314c44f60..a9c8b6ccbb76bf 100644
--- a/llvm/lib/Transforms/Yk/ControlPoint.cpp
+++ b/llvm/lib/Transforms/Yk/ControlPoint.cpp
@@ -47,7 +47,6 @@
 // is shown as C code for easy comprehension.
 
 #include "llvm/Transforms/Yk/ControlPoint.h"
-#include "llvm/ADT/PostOrderIterator.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/DiagnosticInfo.h"
@@ -59,8 +58,6 @@
 #include "llvm/IR/Verifier.h"
 #include "llvm/InitializePasses.h"
 #include "llvm/Pass.h"
-#include "llvm/Transforms/Yk/LivenessAnalysis.h"
-#include <map>
 
 #define DEBUG_TYPE "yk-control-point"
 
@@ -130,18 +127,6 @@ class YkControlPoint : public ModulePass {
       return false;
     }
 
-    // Find all live variables just before the call to the control point.
-    LivenessAnalysis LA(OldCtrlPointCall->getFunction());
-    const std::vector<Value *> LiveVals =
-        LA.getLiveVarsBefore(OldCtrlPointCall);
-    if (LiveVals.size() == 0) {
-      Context.emitError(
-          "The interpreter loop has no live variables!\n"
-          "ykllvm doesn't support this scenario, as such an interpreter would "
-          "make little sense.");
-      return false;
-    }
-
     // The old control point should be of the form:
     //    control_point(YkMT*, YkLocation*)
     assert(OldCtrlPointCall->arg_size() == YK_OLD_CONTROL_POINT_NUM_ARGS);