diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt
--- a/mlir/lib/EDSC/CMakeLists.txt
+++ b/mlir/lib/EDSC/CMakeLists.txt
@@ -14,14 +14,3 @@
   MLIRSupport
   )
 
-add_mlir_library(MLIREDSCInterface
-  CoreAPIs.cpp
-
-  ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/EDSC
-
-  LINK_LIBS PUBLIC
-  MLIRIR
-  MLIRSupport
-  MLIRParser
-  )
diff --git a/mlir/lib/EDSC/CoreAPIs.cpp b/mlir/lib/EDSC/CoreAPIs.cpp
deleted file mode 100644
--- a/mlir/lib/EDSC/CoreAPIs.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//===- Types.cpp - Implementations of MLIR Core C APIs --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "mlir-c/Core.h"
-
-#include "mlir/IR/AffineMap.h"
-#include "mlir/IR/Attributes.h"
-#include "mlir/IR/Function.h"
-#include "mlir/IR/MLIRContext.h"
-#include "mlir/IR/StandardTypes.h"
-#include "mlir/IR/Types.h"
-#include "mlir/Support/LLVM.h"
-
-#include "mlir/Parser.h"
-
-#include "llvm/ADT/StringSwitch.h"
-
-using namespace mlir;
-
-mlir_type_t makeMemRefType(mlir_context_t context, mlir_type_t elemType,
-                           int64_list_t sizes) {
-  auto t = mlir::MemRefType::get(
-      ArrayRef<int64_t>(sizes.values, sizes.n),
-      mlir::Type::getFromOpaquePointer(elemType),
-      {mlir::AffineMap::getMultiDimIdentityMap(
-          sizes.n, reinterpret_cast<mlir::MLIRContext *>(context))},
-      0);
-  return mlir_type_t{t.getAsOpaquePointer()};
-}
-
-mlir_type_t makeFunctionType(mlir_context_t context, mlir_type_list_t inputs,
-                             mlir_type_list_t outputs) {
-  SmallVector<mlir::Type, 8> ins(inputs.n), outs(outputs.n);
-  for (unsigned i = 0; i < inputs.n; ++i) {
-    ins[i] = mlir::Type::getFromOpaquePointer(inputs.types[i]);
-  }
-  for (unsigned i = 0; i < outputs.n; ++i) {
-    outs[i] = mlir::Type::getFromOpaquePointer(outputs.types[i]);
-  }
-  auto ft = mlir::FunctionType::get(
-      ins, outs, reinterpret_cast<mlir::MLIRContext *>(context));
-  return mlir_type_t{ft.getAsOpaquePointer()};
-}
-
-mlir_type_t makeIndexType(mlir_context_t context) {
-  auto *ctx = reinterpret_cast<mlir::MLIRContext *>(context);
-  auto type = mlir::IndexType::get(ctx);
-  return mlir_type_t{type.getAsOpaquePointer()};
-}
-
-mlir_attr_t makeIntegerAttr(mlir_type_t type, int64_t value) {
-  auto ty = Type::getFromOpaquePointer(reinterpret_cast<const void *>(type));
-  auto attr = IntegerAttr::get(ty, value);
-  return mlir_attr_t{attr.getAsOpaquePointer()};
-}
-
-mlir_attr_t makeBoolAttr(mlir_context_t context, bool value) {
-  auto *ctx = reinterpret_cast<mlir::MLIRContext *>(context);
-  auto attr = BoolAttr::get(value, ctx);
-  return mlir_attr_t{attr.getAsOpaquePointer()};
-}
-
-mlir_attr_t makeFloatAttr(mlir_context_t context, float value) {
-  auto *ctx = reinterpret_cast<mlir::MLIRContext *>(context);
-  auto attr = FloatAttr::get(FloatType::getF32(ctx), APFloat(value));
-  return mlir_attr_t{attr.getAsOpaquePointer()};
-}
-
-mlir_attr_t makeStringAttr(mlir_context_t context, const char *value) {
-  auto *ctx = reinterpret_cast<mlir::MLIRContext *>(context);
-  auto attr = StringAttr::get(value, ctx);
-  return mlir_attr_t{attr.getAsOpaquePointer()};
-}
-
-unsigned getFunctionArity(mlir_func_t function) {
-  auto f = mlir::FuncOp::getFromOpaquePointer(function);
-  return f.getNumArguments();
-}
-
-mlir_type_t mlirParseType(const char *type, mlir_context_t context,
-                          uint64_t *charsRead) {
-  auto *ctx = reinterpret_cast<MLIRContext *>(context);
-  size_t numRead = 0;
-  Type ty = parseType(type, ctx, numRead);
-  if (charsRead)
-    *charsRead = numRead;
-  return mlir_type_t{ty.getAsOpaquePointer()};
-}