diff --git a/core/Makefile b/core/Makefile
index 62b4610ca..b3b6454b0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2353,7 +2353,6 @@ OTATOOLS :=  $(HOST_OUT_EXECUTABLES)/minigzip \
   $(HOST_OUT_EXECUTABLES)/delta_generator \
   $(AVBTOOL) \
   $(BLK_ALLOC_TO_BASE_FS) \
-  $(BPTTOOL) \
   $(BROTLI) \
   $(BUILD_VERITY_METADATA) \
   $(BUILD_VERITY_TREE)
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 1deb03189..14d0ca49a 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -222,15 +222,6 @@ def LoadInfoDict(input_file, input_dir=None):
             vendor_base_fs_file,))
         del d["vendor_base_fs_file"]
 
-    # If board_bpt_input_files property is defined then bpttool is being used to
-    # generate the partition table. When signing target-files, the combined
-    # partition table definition is copied into META/partition-table.bpt since
-    # the original input files aren't available.
-    if "board_bpt_input_files" in d:
-      board_bpt_input_files = os.path.join(input_dir, "META", "partition-table.bpt")
-      if os.path.exists(board_bpt_input_files):
-        d["board_bpt_input_files"] = board_bpt_input_files
-
   def makeint(key):
     if key in d:
       d[key] = int(d[key], 0)