diff --git a/extract-files.sh b/extract-files.sh
index 3bf66c5..0ec28fc 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -12,11 +12,6 @@ MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 ANDROID_ROOT="${MY_DIR}/../../.."
-export TARGET_ENABLE_CHECKELF="true"
-
-# If XML files don't have comments before the XML header, use this flag
-# Can still be used with broken XML files by using blob_fixup
-export TARGET_DISABLE_XML_FIXING=true
 
 # Define the default patchelf version used to patch blobs
 # This will also be used for utility functions like FIX_SONAME
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index f363e6f..1cd9757 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -12,7 +12,6 @@ MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 ANDROID_ROOT="${MY_DIR}/../../.."
-export TARGET_ENABLE_CHECKELF="true"
 
 HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then