diff --git a/lib/cli.py b/lib/cli.py
index 99031920fac28587cd9487355fd9715f31f2aee9..24027526811dc316f744ed008a025683a2117065 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -377,6 +377,7 @@ def SubmitOpCode(op, proc=None, feedback_fn=None):
   interaction functions.
 
   """
+  # TODO: Fix feedback_fn situation.
   cl = luxi.Client()
   job = opcodes.Job(op_list=[op])
   jid = SubmitJob(job)
@@ -407,12 +408,6 @@ def SubmitOpCode(op, proc=None, feedback_fn=None):
     raise errors.OpExecError(op_result[0])
   return op_result[0]
 
-  if feedback_fn is None:
-    feedback_fn = logger.ToStdout
-  if proc is None:
-    proc = mcpu.Processor(feedback=feedback_fn)
-  return proc.ExecOpCode(op)
-
 
 def SubmitJob(job, cl=None):
   if cl is None: