diff --git a/.gitmodules b/.gitmodules
index 3d0b202f2..a4b6a7412 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = third_party/mlir-air
 	url = https://github.com/nod-ai/mlir-air.git
 	shallow = true
-[submodule "third_party/mlir-aie"]
-	path = third_party/mlir-aie
-	url = https://github.com/nod-ai/mlir-aie.git
-	shallow = true
 [submodule "third_party/aie-rt"]
 	path = third_party/aie-rt
 	url = https://github.com/Xilinx/aie-rt.git
diff --git a/experimental/delegate/README.md b/experimental/delegate/README.md
index 002ac7e88..6b15bb37f 100644
--- a/experimental/delegate/README.md
+++ b/experimental/delegate/README.md
@@ -211,12 +211,10 @@ cd <workspace root (containing iree-build)>
 export IREE_ROOT=$PWD
 cd iree-amd-aie/experimental/delegate
 export IREE_INSTALL_DIR=$IREE_ROOT/iree-build/
-export MLIR_AIE_INSTALL_DIR=$IREE_ROOT/iree-amd-aie/third_party/mlir-aie/install
 export PEANO_INSTALL_DIR=$IREE_ROOT/install
 export VITIS_INSTALL_PATH=/proj/xbuilds/2023.2_released/installs/lin64/Vitis/2023.2
 
 ../../build_tools/ci/run_matmul_test.sh  results_dir_tmp  $IREE_INSTALL_DIR  \
-    $MLIR_AIE_INSTALL_DIR   $PEANO_INSTALL_DIR  /opt/xilinx/xrt \
     $VITIS_INSTALL_PATH 0
 ```
 
diff --git a/iree_compiler_plugin.cmake b/iree_compiler_plugin.cmake
index 1061b273b..7ec4465b4 100644
--- a/iree_compiler_plugin.cmake
+++ b/iree_compiler_plugin.cmake
@@ -10,7 +10,6 @@ include_directories(${Boost_INCLUDE_DIRS})
 set(IREE_AMD_AIE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}")
 set(IREE_AMD_AIE_RUNTIME_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/runtime/src)
 set(IREE_MLIR_AIR_SOURCE_DIR "${IREE_AMD_AIE_SOURCE_DIR}/third_party/mlir-air/mlir")
-set(IREE_MLIR_AIE_SOURCE_DIR "${IREE_AMD_AIE_SOURCE_DIR}/third_party/mlir-aie")
 
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/compiler/plugins/target/AMD-AIE target/AMD-AIE)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tests/samples AMD-AIE/tests/samples)
diff --git a/iree_runtime_plugin.cmake b/iree_runtime_plugin.cmake
index 080c78bbe..b76099120 100644
--- a/iree_runtime_plugin.cmake
+++ b/iree_runtime_plugin.cmake
@@ -8,7 +8,6 @@ include(FetchContent)
 
 set(IREE_AMD_AIE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}")
 set(IREE_MLIR_AIR_SOURCE_DIR "${IREE_AMD_AIE_SOURCE_DIR}/third_party/mlir-air/mlir")
-set(IREE_MLIR_AIE_SOURCE_DIR "${IREE_AMD_AIE_SOURCE_DIR}/third_party/mlir-aie")
 
 set(IREE_AMD_AIE_ENABLE_XRT_DRIVER OFF)
 if("xrt" IN_LIST IREE_EXTERNAL_HAL_DRIVERS)
diff --git a/runtime/src/iree-amd-aie/aie_runtime/test/CMakeLists.txt b/runtime/src/iree-amd-aie/aie_runtime/test/CMakeLists.txt
index 227bda174..6ec772dd6 100644
--- a/runtime/src/iree-amd-aie/aie_runtime/test/CMakeLists.txt
+++ b/runtime/src/iree-amd-aie/aie_runtime/test/CMakeLists.txt
@@ -105,10 +105,4 @@ iree_lit_test(
     "hostonly"
 )
 
-
-#target_include_directories(
-#  iree-amd-aie_aie_runtime_test_DeviceModelTestCppTest
-#  PRIVATE "${IREE_MLIR_AIE_SOURCE_DIR}/include"
-#)
-
 add_subdirectory(cdo)
diff --git a/runtime/src/iree-amd-aie/aie_runtime/test/cdo/CMakeLists.txt b/runtime/src/iree-amd-aie/aie_runtime/test/cdo/CMakeLists.txt
index b20e0518c..664c78da6 100644
--- a/runtime/src/iree-amd-aie/aie_runtime/test/cdo/CMakeLists.txt
+++ b/runtime/src/iree-amd-aie/aie_runtime/test/cdo/CMakeLists.txt
@@ -14,11 +14,6 @@ iree_cc_binary(
     iree_target_amd-aie_Target_AIETargets
 )
 
-target_include_directories(
-  iree-amd-aie_aie_runtime_test_cdo_aie_cdo_gen_test
-  PRIVATE "${IREE_MLIR_AIE_SOURCE_DIR}/include"
-)
-
 file(GLOB _mlir_files *.mlir)
 
 iree_lit_test_suite(
diff --git a/third_party/mlir-aie b/third_party/mlir-aie
deleted file mode 160000
index 527370a0d..000000000
--- a/third_party/mlir-aie
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 527370a0d3982a20a8559944fbcaa532356b2819