diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index cc24a53..fc6764b 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -22,18 +22,6 @@
 ifneq ($(HOST_OS),windows)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := mkuserimg_mke2fs.sh
-LOCAL_SRC_FILES := mkuserimg_mke2fs.sh
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_REQUIRED_MODULES := mke2fs e2fsdroid
-# We don't need any additional suffix.
-LOCAL_MODULE_SUFFIX :=
-LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))
-LOCAL_IS_HOST_MODULE := true
-include $(BUILD_PREBUILT)
-
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := mke2fs.conf
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 LOCAL_MODULE_CLASS := EXECUTABLES
diff --git a/ext4_utils/mkuserimg_mke2fs.sh b/ext4_utils/mkuserimg_mke2fs.sh
deleted file mode 100755
index 408b4c9..0000000
--- a/ext4_utils/mkuserimg_mke2fs.sh
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/bash
-#
-# To call this script, make sure mke2fs is somewhere in PATH
-
-function usage() {
-cat<<EOT
-Usage:
-mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>]
-             [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE]
-             [-d BASE_ALLOC_FILE_IN ] [-A BASE_ALLOC_FILE_OUT ] [-L LABEL]
-             [-i INODES ] [-M RSV_PCT] [-e ERASE_BLOCK_SIZE] [-o FLASH_BLOCK_SIZE]
-             [-U MKE2FS_UUID] [-S MKE2FS_HASH_SEED] [-c] [FILE_CONTEXTS]
-EOT
-}
-
-BLOCKSIZE=4096
-
-MKE2FS_OPTS=""
-MKE2FS_EXTENDED_OPTS=""
-E2FSDROID_OPTS=""
-E2FSPROGS_FAKE_TIME=""
-
-if [ "$1" = "-s" ]; then
-  MKE2FS_EXTENDED_OPTS+="android_sparse"
-  shift
-else
-  E2FSDROID_OPTS+="-e"
-fi
-
-if [ $# -lt 5 ]; then
-  usage
-  exit 1
-fi
-
-SRC_DIR=$1
-if [ ! -d $SRC_DIR ]; then
-  echo "Can not find directory $SRC_DIR!"
-  exit 2
-fi
-
-OUTPUT_FILE=$2
-EXT_VARIANT=$3
-MOUNT_POINT=$4
-SIZE=$5
-shift; shift; shift; shift; shift
-
-if [ "$1" = "-j" ]; then
-  if [ "$2" = "0" ]; then
-    MKE2FS_OPTS+="-O ^has_journal"
-  else
-    MKE2FS_OPTS+="-J size=$2"
-  fi
-  shift; shift
-fi
-
-if [[ "$1" == "-T" ]]; then
-  E2FSDROID_OPTS+=" -T $2"
-  E2FSPROGS_FAKE_TIME=$2
-  shift; shift
-fi
-
-if [[ "$1" == "-C" ]]; then
-  E2FSDROID_OPTS+=" -C $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-D" ]]; then
-  E2FSDROID_OPTS+=" -p $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-B" ]]; then
-  E2FSDROID_OPTS+=" -B $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-d" ]]; then
-  E2FSDROID_OPTS+=" -d $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-A" ]]; then
-  E2FSDROID_OPTS+=" -D $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-L" ]]; then
-  MKE2FS_OPTS+=" -L $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-i" ]]; then
-  MKE2FS_OPTS+=" -N $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-M" ]]; then
-  MKE2FS_OPTS+=" -m $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-e" ]]; then
-  if [[ $MKE2FS_EXTENDED_OPTS ]]; then
-    MKE2FS_EXTENDED_OPTS+=","
-  fi
-  MKE2FS_EXTENDED_OPTS+="stripe_width=$(($2/BLOCKSIZE))"
-  shift; shift
-fi
-
-if [[ "$1" == "-o" ]]; then
-  if [[ $MKE2FS_EXTENDED_OPTS ]]; then
-    MKE2FS_EXTENDED_OPTS+=","
-  fi
-  # stride should be the max of 8kb and the logical block size
-  MKE2FS_EXTENDED_OPTS+="stride=$((($2 > 8192 ? $2 : 8192) / BLOCKSIZE))"
-  shift; shift
-fi
-
-if [[ "$1" == "-U" ]]; then
-  MKE2FS_OPTS+=" -U $2"
-  shift; shift
-fi
-
-if [[ "$1" == "-S" ]]; then
-  if [[ $MKE2FS_EXTENDED_OPTS ]]; then
-    MKE2FS_EXTENDED_OPTS+=","
-  fi
-  MKE2FS_EXTENDED_OPTS+="hash_seed=$2"
-  shift; shift
-fi
-
-if [[ "$1" == "-c" ]]; then
-  E2FSDROID_OPTS+=" -s"
-  shift;
-fi
-
-if [[ $MKE2FS_EXTENDED_OPTS ]]; then
-  MKE2FS_OPTS+=" -E $MKE2FS_EXTENDED_OPTS"
-fi
-
-if [[ $1 ]]; then
-  E2FSDROID_OPTS+=" -S $1"
-fi
-
-case $EXT_VARIANT in
-  ext2) ;;
-  ext4) ;;
-  *) echo "Only ext2/4 are supported!"; exit 3 ;;
-esac
-
-if [ -z $MOUNT_POINT ]; then
-  echo "Mount point is required"
-  exit 2
-fi
-
-if [[ ${MOUNT_POINT:0:1} != "/" ]]; then
-  MOUNT_POINT="/"$MOUNT_POINT
-fi
-
-if [ -z $SIZE ]; then
-  echo "Need size of filesystem"
-  exit 2
-fi
-
-# Round down the filesystem length to be a multiple of the block size
-SIZE=$((SIZE / BLOCKSIZE))
-
-# truncate output file since mke2fs will keep verity section in existing file
-cat /dev/null >$OUTPUT_FILE
-
-MAKE_EXT4FS_ENV="MKE2FS_CONFIG=./system/extras/ext4_utils/mke2fs.conf"
-if [[ $E2FSPROGS_FAKE_TIME ]]; then
-  MAKE_EXT4FS_ENV+=" E2FSPROGS_FAKE_TIME=$E2FSPROGS_FAKE_TIME"
-fi
-
-MAKE_EXT4FS_CMD="mke2fs $MKE2FS_OPTS -t $EXT_VARIANT -b $BLOCKSIZE $OUTPUT_FILE $SIZE"
-echo $MAKE_EXT4FS_ENV $MAKE_EXT4FS_CMD
-env $MAKE_EXT4FS_ENV $MAKE_EXT4FS_CMD
-if [ $? -ne 0 ]; then
-  exit 4
-fi
-
-if [[ $E2FSPROGS_FAKE_TIME ]]; then
-  E2FSDROID_ENV="E2FSPROGS_FAKE_TIME=$E2FSPROGS_FAKE_TIME"
-fi
-
-E2FSDROID_CMD="e2fsdroid $E2FSDROID_OPTS -f $SRC_DIR -a $MOUNT_POINT $OUTPUT_FILE"
-echo $E2FSDROID_ENV $E2FSDROID_CMD
-env $E2FSDROID_ENV $E2FSDROID_CMD
-if [ $? -ne 0 ]; then
-  rm -f $OUTPUT_FILE
-  exit 4
-fi