diff --git a/oem-cameras/HwCamera2/Android.mk b/oem-cameras/HwCamera2/Android.mk
deleted file mode 100644
index 3c49c45..0000000
--- a/oem-cameras/HwCamera2/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2017-2018 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.
-
-# This file is generated by device/motorola/nash/setup-makefiles.sh
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := HwCamera2
-LOCAL_MODULE_OWNER := huawei
-LOCAL_SRC_FILES := HwCamera2.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Snap
-include $(BUILD_PREBUILT)
diff --git a/oem-cameras/HwCamera2/HwCamera2.apk b/oem-cameras/HwCamera2/HwCamera2.apk
deleted file mode 100644
index bcd6bfd..0000000
Binary files a/oem-cameras/HwCamera2/HwCamera2.apk and /dev/null differ
diff --git a/oem-cameras/HwCamera2/HwCamera2.mk b/oem-cameras/HwCamera2/HwCamera2.mk
deleted file mode 100644
index 7cf20f6..0000000
--- a/oem-cameras/HwCamera2/HwCamera2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-PRODUCT_PACKAGES += \
-    HwCamera2
-
-PRODUCT_COPY_FILES := \
-    vendor/extra/oem-cameras/HwCamera2/privapp-permissions-huawei.xml:system/etc/permissions/privapp-permissions-huawei.xml \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libfyusenet.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libfyusenet.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libgif_maker.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libgif_maker.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libHW_Pano_f.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libHW_Pano_f.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libHwPostCamera_jni.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libHwPostCamera_jni.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libIvw35.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libIvw35.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_camera2.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_camera2.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libJniVoiceCapture.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libJniVoiceCapture.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libmorpho_memory_allocator.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libmorpho_memory_allocator.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libmorpho_panorama_gp.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libmorpho_panorama_gp.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libscanner.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libscanner.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libTargetTracking.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libTargetTracking.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/libtrack.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/libtrack.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so \
-    vendor/extra/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so:system/priv-app/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so
diff --git a/oem-cameras/HwCamera2/lib/arm/libHW_Pano_f.so b/oem-cameras/HwCamera2/lib/arm/libHW_Pano_f.so
deleted file mode 100644
index 40b99b6..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libHW_Pano_f.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libHwPostCamera_jni.so b/oem-cameras/HwCamera2/lib/arm/libHwPostCamera_jni.so
deleted file mode 100644
index d29ca98..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libHwPostCamera_jni.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libIvw35.so b/oem-cameras/HwCamera2/lib/arm/libIvw35.so
deleted file mode 100644
index 5cb2060..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libIvw35.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libJniVoiceCapture.so b/oem-cameras/HwCamera2/lib/arm/libJniVoiceCapture.so
deleted file mode 100644
index 4d5d026..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libJniVoiceCapture.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libTargetTracking.so b/oem-cameras/HwCamera2/lib/arm/libTargetTracking.so
deleted file mode 100644
index e2b1b75..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libTargetTracking.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libfyusenet.so b/oem-cameras/HwCamera2/lib/arm/libfyusenet.so
deleted file mode 100644
index 4d3c648..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libfyusenet.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libgif_maker.so b/oem-cameras/HwCamera2/lib/arm/libgif_maker.so
deleted file mode 100644
index 968aad9..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libgif_maker.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so b/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so
deleted file mode 100644
index a4fcaa5..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_camera2.so b/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_camera2.so
deleted file mode 100644
index 742ce67..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libjni_front_panorama_camera2.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so b/oem-cameras/HwCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so
deleted file mode 100644
index fd19051..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libmorpho_memory_allocator.so b/oem-cameras/HwCamera2/lib/arm/libmorpho_memory_allocator.so
deleted file mode 100644
index 6553c5d..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libmorpho_memory_allocator.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libmorpho_panorama_gp.so b/oem-cameras/HwCamera2/lib/arm/libmorpho_panorama_gp.so
deleted file mode 100644
index 71244c8..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libmorpho_panorama_gp.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libscanner.so b/oem-cameras/HwCamera2/lib/arm/libscanner.so
deleted file mode 100644
index 943b534..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libscanner.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/libtrack.so b/oem-cameras/HwCamera2/lib/arm/libtrack.so
deleted file mode 100644
index aa93dd8..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/libtrack.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so b/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so
deleted file mode 100644
index d0c39b5..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so b/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so
deleted file mode 100644
index 483018e..0000000
Binary files a/oem-cameras/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so and /dev/null differ
diff --git a/oem-cameras/HwCamera2/privapp-permissions-huawei.xml b/oem-cameras/HwCamera2/privapp-permissions-huawei.xml
deleted file mode 100644
index a428369..0000000
--- a/oem-cameras/HwCamera2/privapp-permissions-huawei.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<permissions>
-    <privapp-permissions package="com.huawei.camera">
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-    </privapp-permissions>
-</permissions>
-
diff --git a/product.mk b/product.mk
index 625776c..e8a2e47 100644
--- a/product.mk
+++ b/product.mk
@@ -6,12 +6,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/extra/adb_keys:recovery/root/adb_keys
 
-## Custom Cameras
-# berkeley
-ifneq ($(filter %berkeley,$(TARGET_PRODUCT)),)
--include vendor/extra/oem-cameras/HwCamera2/HwCamera2.mk
-endif
-
 ## Media
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.vc_call_vol_steps=7 \