diff --git a/core/config.mk b/core/config.mk
index 0c8a87f678..ae659441de 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1246,12 +1246,6 @@ BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST := LegacyCamera Gallery2
 # in the source tree.
 dont_bother_goals := out product-graph
 
-ifeq ($(TARGET_SYSTEM_PROP),)
-TARGET_SYSTEM_PROP := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
-endif
-
-.KATI_READONLY += TARGET_SYSTEM_PROP
-
 include $(BUILD_SYSTEM)/sysprop_config.mk
 
 # Make ANDROID Soong config variables visible to Android.mk files, for
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 548e882aa5..9be3340eb2 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -361,8 +361,6 @@ $(call add_json_bool, BoardUseVbmetaDigestInFingerprint, $(filter true,$(BOARD_U
 
 $(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES))
 
-$(call add_json_list, SystemPropFiles, $(TARGET_SYSTEM_PROP))
-
 # Do not set ArtTargetIncludeDebugBuild into any value if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD is not set,
 # to have the same behavior from runtime_libart.mk.
 ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),)
diff --git a/core/soong_extra_config.mk b/core/soong_extra_config.mk
index 2df721fa05..e4432d2c5c 100644
--- a/core/soong_extra_config.mk
+++ b/core/soong_extra_config.mk
@@ -93,8 +93,6 @@ $(call add_json_str, VendorImageFileSystemType, $(BOARD_VENDORIMAGE_FILE_SYSTEM_
 
 $(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))
 
-$(call add_json_bool, ProductNotDebuggableInUserdebug, $(PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG))
-
 $(call json_end)
 
 $(shell mkdir -p $(dir $(SOONG_EXTRA_VARIABLES)))
diff --git a/core/sysprop.mk b/core/sysprop.mk
index 615025de13..47d8a41a38 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -231,7 +231,11 @@ KNOWN_OEM_THUMBPRINT_PROPERTIES:=
 
 buildinfo_prop := $(call intermediates-dir-for,ETC,buildinfo.prop)/buildinfo.prop
 
+ifdef TARGET_SYSTEM_PROP
 system_prop_file := $(TARGET_SYSTEM_PROP)
+else
+system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
+endif
 
 _prop_files_ := \
   $(buildinfo_prop) \