diff --git a/extract-files.sh b/extract-files.sh
index b1275fa..d2f491a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -16,12 +16,6 @@
 
 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
-
 HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 051049a..013ae23 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -16,8 +16,6 @@
 
 ANDROID_ROOT="${MY_DIR}/../../.."
 
-export TARGET_ENABLE_CHECKELF=true
-
 HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"