diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index e4356fb6..fea0b138 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -45,7 +45,6 @@ jobs:
         # Additional CMake flags.
         PLATFORM: ${{ matrix.platform.name }}
         CMAKE_BUILD_TYPE: Debug
-        ENABLE_PREFIX_TREE: OFF
         ENABLE_CLANG_TIDY: ON
         BUILD_TESTS: ${{ matrix.platform.unit_tests_enabled }}
         # These make CI print all the errors, rather than stopping early.
diff --git a/.pipelines/pullrequest.yml b/.pipelines/pullrequest.yml
index 3c0c63b9..19f4aa31 100644
--- a/.pipelines/pullrequest.yml
+++ b/.pipelines/pullrequest.yml
@@ -94,7 +94,6 @@ extends:
           RunTests: false
           Environment:
             CMAKE_BUILD_TYPE: Debug
-            ENABLE_PREFIX_TREE: OFF
             ENABLE_CLANG_TIDY: ON
           InstallPackages: [ libcurl4-openssl-dev, clang-tidy-10 ]
 
@@ -102,8 +101,6 @@ extends:
         parameters:
           Name: test_virtual
           DisplayName: Build and test (Virtual)
-          Environment:
-            ENABLE_PREFIX_TREE: OFF
           FunctionalTestArguments: '--enable-faketime'
           InstallPackages: [ libcurl4-openssl-dev, faketime ]
 
@@ -119,7 +116,6 @@ extends:
           PLATFORM: virtual
           CXXFLAGS: -ferror-limit=0
           NINJA_FLAGS: -k 0
-          ENABLE_PREFIX_TREE: OFF
         steps:
           - checkout: SCITT
             path: s/
@@ -172,7 +168,6 @@ extends:
                 --env PLATFORM="sgx" \
                 --env CMAKE_BUILD_TYPE="Release" \
                 --env CCF_UNSAFE="OFF" \
-                --env ENABLE_PREFIX_TREE="OFF" \
                 --env BUILD_TESTS="OFF" \
                 --env ENABLE_CLANG_TIDY="OFF" \
                 --env NINJA_FLAGS="-k 0" \
@@ -199,7 +194,6 @@ extends:
           PLATFORM: sgx
           CXXFLAGS: -ferror-limit=0
           NINJA_FLAGS: -k 0
-          ENABLE_PREFIX_TREE: OFF
         steps:
           - checkout: SCITT
             path: s/
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 073bd187..9404c05f 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -27,11 +27,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 find_package(ccf_${COMPILE_TARGET} 5.0.0 REQUIRED)
 
-
-if (ENABLE_PREFIX_TREE)
-  add_compile_definitions(ENABLE_PREFIX_TREE)
-endif ()
-
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/target_link_system_libraries.cmake)
 
diff --git a/app/src/constants.h b/app/src/constants.h
index 5f00c1a6..edc6fe1e 100644
--- a/app/src/constants.h
+++ b/app/src/constants.h
@@ -29,7 +29,6 @@ namespace scitt
     const std::string QueryParameterError = "QueryParameterError";
     const std::string PayloadTooLarge = "PayloadTooLarge";
     const std::string UnknownFeed = "UnknownFeed";
-    const std::string NoPrefixTree = "NoPrefixTree";
     const std::string NotFound = "NotFound";
     const std::string OperationExpired = "OperationExpired";
     const std::string PolicyError = "PolicyError";
diff --git a/app/src/main.cpp b/app/src/main.cpp
index d72abb72..39a1a6be 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -789,10 +789,6 @@ namespace scitt
       register_service_endpoints(context, *this);
       register_operations_endpoints(
         context, *this, authn_policy, post_entry_continuation);
-
-#ifdef ENABLE_PREFIX_TREE
-      PrefixTreeFrontend::init_handlers(context, *this);
-#endif
     }
   };
 } // namespace scitt
diff --git a/build.sh b/build.sh
index 26ce5cc9..9365f41a 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,6 @@ set -ex
 CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
 PLATFORM=${PLATFORM:-sgx}
 CCF_UNSAFE=${CCF_UNSAFE:-OFF}
-ENABLE_PREFIX_TREE=${ENABLE_PREFIX_TREE:-OFF}
 BUILD_TESTS=${BUILD_TESTS:-ON}
 ENABLE_CLANG_TIDY=${ENABLE_CLANG_TIDY:-OFF}
 NINJA_FLAGS=${NINJA_FLAGS:-}
@@ -61,7 +60,6 @@ CC="$CC" CXX="$CXX" \
     -DATTESTED_FETCH_MRENCLAVE_HEX="${ATTESTED_FETCH_MRENCLAVE_HEX}" \
     -DCOMPILE_TARGET="${PLATFORM}" \
     -DCCF_UNSAFE="${CCF_UNSAFE}" \
-    -DENABLE_PREFIX_TREE="${ENABLE_PREFIX_TREE}" \
     -DBUILD_TESTS="${BUILD_TESTS}" \
     -DLVI_MITIGATIONS=OFF \
     -DCMAKE_INSTALL_PREFIX=$install_dir \