diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbc678c72..4f8b54eee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,12 +10,10 @@ project(taco
   LANGUAGES C CXX
 )
 option(CUDA "Build for NVIDIA GPU (CUDA must be preinstalled)" OFF)
-option(ISPC "Build for Intel ISPC Compiler (ISPC Compiler must be preinstalled)" OFF)
 option(PYTHON "Build TACO for python environment" OFF)
 option(OPENMP "Build with OpenMP execution support" ON)
 option(COVERAGE "Build with code coverage analysis" OFF)
 set(TACO_FEATURE_CUDA 0)
-set(TACO_FEATURE_ISPC 0)
 set(TACO_FEATURE_OPENMP 1)
 set(TACO_FEATURE_PYTHON 0)
 if(CUDA)
@@ -24,11 +22,6 @@ if(CUDA)
   add_definitions(-DCUDA_BUILT)
   set(TACO_FEATURE_CUDA 1)
 endif(CUDA)
-if(ISPC)
-  message("-- Searching for ISPC Installation")
-  add_definitions(-DISPC_BUILT)
-  set(TACO_FEATURE_ISPC 1)
-endif(ISPC) 
 if(OPENMP)
   message("-- Will use OpenMP for parallel execution")
   add_definitions(-DUSE_OPENMP)
diff --git a/include/taco/taco_tensor_t.h b/include/taco/taco_tensor_t.h
index f27acd9c7..20d78bb51 100644
--- a/include/taco/taco_tensor_t.h
+++ b/include/taco/taco_tensor_t.h
@@ -6,7 +6,6 @@
 #ifndef TACO_TENSOR_T_DEFINED
 #define TACO_TENSOR_T_DEFINED
 
-#include <cstdint>
 #include <stdint.h>
 
 typedef enum { taco_mode_dense, taco_mode_sparse } taco_mode_t;
diff --git a/include/taco/util/strings.h b/include/taco/util/strings.h
index 35d2c3949..5dfb2f174 100644
--- a/include/taco/util/strings.h
+++ b/include/taco/util/strings.h
@@ -1,7 +1,6 @@
 #ifndef TACO_UTIL_STRINGS_H
 #define TACO_UTIL_STRINGS_H
 
-#include "taco/cuda.h"
 #include <string>
 #include <sstream>
 #include <vector>
diff --git a/include/taco/version.h.in b/include/taco/version.h.in
index 8ef507598..bc5559d7d 100644
--- a/include/taco/version.h.in
+++ b/include/taco/version.h.in
@@ -20,6 +20,5 @@
 #define TACO_FEATURE_OPENMP @TACO_FEATURE_OPENMP@
 #define TACO_FEATURE_PYTHON @TACO_FEATURE_PYTHON@
 #define TACO_FEATURE_CUDA   @TACO_FEATURE_CUDA@
-#define TACO_FEATURE_ISPC   @TACO_FEATURE_ISPC@
 
 #endif /* TACO_VERSION_H */
diff --git a/src/codegen/codegen_c.cpp b/src/codegen/codegen_c.cpp
index 6dd39107d..d55adbe58 100644
--- a/src/codegen/codegen_c.cpp
+++ b/src/codegen/codegen_c.cpp
@@ -241,7 +241,7 @@ class CodeGen_C::FindVars : public IRVisitor {
 };
 
 CodeGen_C::CodeGen_C(std::ostream &dest, OutputKind outputKind, bool simplify)
-    : CodeGen(dest, false, simplify, C), out(dest), out2(dest), outputKind(outputKind) {}
+    : CodeGen(dest, false, simplify, C), out(dest), outputKind(outputKind) {}
 
 CodeGen_C::~CodeGen_C() {}
 
@@ -300,17 +300,14 @@ void CodeGen_C::visit(const Function* func) {
 
   // Print variable declarations
   out << printDecls(varFinder.varDecls, func->inputs, func->outputs) << endl;
-  // out << "printf(\"declarations added\\n\");" << std::endl;
 
   if (emittingCoroutine) {
     out << printContextDeclAndInit(varMap, localVars, numYields, func->name)
         << endl;
   }
-  // out << "printf(\"declarations added2\\n\");" << std::endl;
 
   // output body
   print(func->body);
-  // out << "printf(\"function body added " << count++ << "\\n\"); // " << std::endl;
 
 
   // output repack only if we allocated memory
@@ -409,8 +406,6 @@ static string getAtomicPragma() {
 // http://clang.llvm.org/docs/LanguageExtensions.html#extensions-for-loop-hint-optimizations
 void CodeGen_C::visit(const For* op) {
 
-  // out << "    printf(\"adding for loop " << count++ << "\\n\"); //" << std::endl;
-
   switch (op->kind) {
     case LoopKind::Vectorized:
       doIndent();
@@ -460,14 +455,6 @@ void CodeGen_C::visit(const For* op) {
   }
   stream << ") {\n";
 
-  // out << "  printf(\"loop " << count++ << " : %d  , dim: %d, %d\\n\",";
-  // op->var.accept(this);
-  // out << ", ";
-  // op->start.accept(this);
-  // out << ", ";
-  // op->end.accept(this);
-  // out << "); // " << count++ << std::endl;
-
   op->contents.accept(this);
   doIndent();
   stream << "}";
@@ -488,7 +475,6 @@ void CodeGen_C::visit(const While* op) {
 }
 
 void CodeGen_C::visit(const GetProperty* op) {
-  // std::cout << "GetProperty* " << op << std::endl;
   taco_iassert(varMap.count(op) > 0) <<
       "Property " << Expr(op) << " of " << op->tensor << " not found in varMap";
   out << varMap[op];
diff --git a/src/codegen/codegen_c.h b/src/codegen/codegen_c.h
index c8505a3bb..37bda6046 100644
--- a/src/codegen/codegen_c.h
+++ b/src/codegen/codegen_c.h
@@ -16,7 +16,6 @@ class CodeGen_C : public CodeGen {
   /// Initialize a code generator that generates code to an
   /// output stream.
   CodeGen_C(std::ostream &dest, OutputKind outputKind, bool simplify=true);
-  CodeGen_C(std::ostream &dest, std::ostream &dest2, OutputKind outputKind, bool simplify=true);
   ~CodeGen_C();
 
   /// Compile a lowered function
@@ -46,7 +45,6 @@ class CodeGen_C : public CodeGen {
   std::map<Expr, std::string, ExprCompare> varMap;
   std::vector<Expr> localVars;
   std::ostream &out;
-  std::ostream &out2;
   int count = 0;
   
   OutputKind outputKind;