diff --git a/libshims/Android.mk b/libshims/Android.mk
index d42a79e..cceea71 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -16,17 +16,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := MediaBuffer.c
-
-LOCAL_SHARED_LIBRARIES := libstagefright_foundation
-
-LOCAL_MODULE := libshims_ims
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
 LOCAL_SRC_FILES := \
     bionic/bionic_time_conversions.cpp \
     bionic/pthread_cond.cpp
diff --git a/libshims/MediaBuffer.c b/libshims/MediaBuffer.c
deleted file mode 100644
index fe76d0a..0000000
--- a/libshims/MediaBuffer.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* TODO: Actually provide implementations for these function! */
-
-void _ZNK7android11MediaBuffer8refcountEv() {}
diff --git a/product/qcom-radio.mk b/product/qcom-radio.mk
index ddcc492..47ef46a 100644
--- a/product/qcom-radio.mk
+++ b/product/qcom-radio.mk
@@ -49,7 +49,3 @@ PRODUCT_PACKAGES += \
     libcnefeatureconfig \
     librmnetctl \
     libxml2
-
-# Libshims
-PRODUCT_PACKAGES += \
-    libshims_ims
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 738d7dc..4acfccb 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -38,7 +38,7 @@ on early-init
     chmod 0755 /sys/kernel/debug
 
 on init
-    export LD_SHIM_LIBS "/system/vendor/lib64/lib-imsvt.so|libshims_ims.so:/system/bin/mm-qcamera-daemon|libshims_camera.so:/system/vendor/lib64/lib-imscamera.so|libshim_ims_camera.so"
+    export LD_SHIM_LIBS "/system/bin/mm-qcamera-daemon|libshims_camera.so:/system/vendor/lib64/lib-imscamera.so|libshim_ims_camera.so"
 
     # Set permissions for persist partition
     mkdir /persist 0771 root system