diff --git a/common.mk b/common.mk
index 2fcf183..6d7fafb 100644
--- a/common.mk
+++ b/common.mk
@@ -17,7 +17,7 @@
 PRODUCT_PROPERTY_OVERRIDES += persist.sys.dun.override=0
 
 # Backup Tool
-PRODUCT_COPY_FILES += \
+#PRODUCT_COPY_FILES += \
     vendor/aosp/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
     vendor/aosp/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
     vendor/aosp/prebuilt/common/bin/blacklist:system/addon.d/blacklist \
@@ -78,16 +78,6 @@
     strace \
     Terminal
 
-# Stagefright FFMPEG plugin
-PRODUCT_PACKAGES += \
-    libffmpeg_extractor \
-    libffmpeg_omx \
-    media_codecs_ffmpeg.xml
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    media.sf.omx-plugin=libffmpeg_omx.so \
-    media.sf.extractor-plugin=libffmpeg_extractor.so
-
 # Telephony packages
 PRODUCT_PACKAGES += \
     messaging \
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg
deleted file mode 100644
index c79e421..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/default_wallpaper.jpg
deleted file mode 100644
index 800dcb2..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
deleted file mode 100644
index dd9b316..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
deleted file mode 100644
index a15ca1f..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
deleted file mode 100644
index 5569e6f..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg
deleted file mode 100644
index 164c660..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg
deleted file mode 100644
index c4bc425..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg
deleted file mode 100644
index 08c1ff4..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg
+++ /dev/null
Binary files differ