diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6bcefc3..6ed8619 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -215,10 +215,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)/releasetools
 # Shim
 TARGET_LD_SHIM_LIBS := \
     /system/vendor/bin/adspd|libshim_adsp.so \
-    /system/lib/lib_motsensorlistener.so|libsensor.so \
-	/system/lib/libjustshoot.so|libshims_camera.so \
-	/system/vendor/lib/libguy.so|libshim_camera_hal.so \
-	/system/vendor/lib64/libmdmcutback.so|libqsap_shim.so
+    /system/vendor/lib64/libmdmcutback.so|libqsap_shim.so
 
 # Wifi
 BOARD_HAS_QCOM_WLAN              := true
diff --git a/libshims/Android.mk b/libshims/Android.mk
index 362e620..613b22c 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -24,24 +24,6 @@ LOCAL_MODULE := libshim_adsp
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := camera_hal.cpp
-LOCAL_MODULE := libshim_camera_hal
-LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := libgui
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := MediaCodec.cpp
-
-LOCAL_SHARED_LIBRARIES := libstagefright libmedia
-
-LOCAL_MODULE := libshims_camera
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := libqsap_shim.c
 LOCAL_SHARED_LIBRARIES := libqsap_sdk liblog
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/libshims/MediaCodec.cpp b/libshims/MediaCodec.cpp
deleted file mode 100644
index 90cc876..0000000
--- a/libshims/MediaCodec.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <media/MediaCodecBuffer.h>
-#include <media/stagefright/foundation/AHandler.h>
-#include <utils/Vector.h>
-
-namespace android {
-
-extern "C" void _ZN7android10MediaCodec12CreateByTypeERKNS_2spINS_7ALooperEEERKNS_7AStringEbPiij(
-	const sp<ALooper> &looper, const AString &mime, bool encoder, status_t *err, pid_t pid, uid_t uid);
-
-extern "C" void _ZNK7android10MediaCodec15getInputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(Vector<sp<ABuffer> > *buffers);
-extern "C" void _ZNK7android10MediaCodec16getOutputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(Vector<sp<ABuffer> > *buffers);
-
-extern "C" void _ZN7android10MediaCodec12CreateByTypeERKNS_2spINS_7ALooperEEERKNS_7AStringEbPii(
-	const sp<ALooper> &looper, const AString &mime, bool encoder, status_t *err, pid_t pid) {
-	_ZN7android10MediaCodec12CreateByTypeERKNS_2spINS_7ALooperEEERKNS_7AStringEbPiij(
-		looper, mime, encoder, err, pid, 0);
-}
-
-extern "C" void _ZNK7android10MediaCodec15getInputBuffersEPNS_6VectorINS_2spINS_7ABufferEEEEE(Vector<sp<ABuffer> > *buffers) {
-	_ZNK7android10MediaCodec15getInputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(buffers);
-}
-
-extern "C" void _ZNK7android10MediaCodec16getOutputBuffersEPNS_6VectorINS_2spINS_7ABufferEEEEE(Vector<sp<ABuffer> > *buffers) {
-	_ZNK7android10MediaCodec16getOutputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(buffers);
-}
-}
diff --git a/libshims/camera_hal.cpp b/libshims/camera_hal.cpp
deleted file mode 100644
index 15339cb..0000000
--- a/libshims/camera_hal.cpp
+++ /dev/null
@@ -1,28 +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.
- */
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-/* TODO: Actually provide implementations for these function! */
-
-extern "C" void _ZN7android20DisplayEventReceiverC1Ev() {}
-
-EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);
-
-extern "C" void _Z35eglQueryStringImplementationANDROIDPvi(EGLDisplay dpy, EGLint name){
-    eglQueryStringImplementationANDROID(dpy, name);
-}
diff --git a/libshims/sensor.cpp b/libshims/sensor.cpp
deleted file mode 100644
index 3769b9e..0000000
--- a/libshims/sensor.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2017 The LineageOS 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.
- */
-
-#include <sensor/Sensor.h>
-
-extern "C" int ASensor_getHandle(ASensor const* sensor)
-{
-    return static_cast<android::Sensor const*>(sensor)->getHandle();
-}