diff --git a/Android.bp b/Android.bp
index 691f4c9..619de75 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6445,37 +6445,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libpowercore",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libpowercore.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libbinder",
-                "libtinyxml2",
-                "vendor.display.config@1.0",
-                "libhidlbase",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libswregistrationalgo",
     owner: "motorola",
@@ -6605,38 +6574,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libvideooptfeature",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libvideooptfeature.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libbinder",
-                "libtinyxml2",
-                "libpowercore",
-                "libdisplayconfig.qti",
-                "libhidlbase",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libvidhance",
     owner: "motorola",
diff --git a/berlin-vendor.mk b/berlin-vendor.mk
index 59d325d..9688819 100644
--- a/berlin-vendor.mk
+++ b/berlin-vendor.mk
@@ -50,8 +50,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.content.ai.xml \
     vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.lens.xml \
     vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.camera3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.xml \
-    vendor/motorola/berlin/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pwr/PowerFeatureConfig.xml \
-    vendor/motorola/berlin/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pwr/VideoPowerOptFeature.xml \
     vendor/motorola/berlin/proprietary/vendor/etc/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667.xml \
     vendor/motorola/berlin/proprietary/vendor/etc/qdcm_calib_data_mipi_mot_cmd_visionox_1080p_dsc_667.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_mipi_mot_cmd_visionox_1080p_dsc_667.xml \
     vendor/motorola/berlin/proprietary/vendor/etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.xml \
@@ -437,13 +435,11 @@ PRODUCT_PACKAGES += \
     libofflinelog \
     libopencv \
     libos \
-    libpowercore \
     libswregistrationalgo \
     libsynx \
     libthreadutils \
     libtriplecam_optical_zoom_control \
     libtriplecam_video_optical_zoom \
-    libvideooptfeature \
     libvidhance \
     libvidhance_active_ois \
     libvidhance_dmbr \
diff --git a/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml b/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml
deleted file mode 100644
index d9c526d..0000000
--- a/proprietary/vendor/etc/pwr/PowerFeatureConfig.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-/******************************************************************************
-  @file    PowerFeatureConfig.xml
-  @brief   Power Optimization feature config xml
-
-  DESCRIPTION
-      This is to enable power features for optimization
-
-  ===========================================================================
-  Copyright (c) 2020 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-  ===========================================================================
-******************************************************************************/
--->
-<PowerFeature>
-    <Feature>
-        <Name>VideoPowerOptFeature</Name>
-        <Enable>1</Enable>
-    </Feature>
-</PowerFeature>
diff --git a/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml b/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml
deleted file mode 100644
index 8f4f0be..0000000
--- a/proprietary/vendor/etc/pwr/VideoPowerOptFeature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-/******************************************************************************
-  @file    VideoOptimizationFeature.xml
-  @brief   Video Optimization feature xml
-
-  DESCRIPTION
-      Each feature has an xml file to define the feature components
-
-  ===========================================================================
-  Copyright (c) 2020-21 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-  ===========================================================================
-******************************************************************************/
--->
-<Feature>
-   <Name>VideoPowerOptFeature</Name>
-   <Libname>libvideooptfeature.so</Libname>
-   <Configs>
-        <MAX_CONTENT_FPS>30</MAX_CONTENT_FPS>
-        <MAX_PANEL_FPS>120</MAX_PANEL_FPS>
-    </Configs>
-    <Profiles>
-        <Profile>
-            <!-- PREDECITIVE_LOAD BIG CORE resource opcode -->
-            <!-- PREDECITIVE_LOAD LITTLE Core resource opcode -->
-            <!-- CPU CORE 4 SCHED LOAD BOOST -->
-            <!-- CPU CORE 5 SCHED LOAD BOOST -->
-            <!-- CPU CORE 6 SCHED LOAD BOOST -->
-            <!-- Disable Colocation  -->
-            <DEFAULT>0x41444000, 0, 0x41444100, 0, 0x40C68140, 0xFFFFFFF6, 0x40C68150, 0xFFFFFFF6, 0x40C68160, 0xFFFFFFF6, 0x40C54000, 999999, 0x40C58000, 999990</DEFAULT>
-        </Profile>
-    </Profiles>
-    <IgnoredApps>
-        <App>com.google.android.gms</App>
-        <App>com.android.vending</App>
-        <App>com.google.android.projection.gearhead</App>
-    </IgnoredApps>
-</Feature>
diff --git a/proprietary/vendor/lib64/libpowercore.so b/proprietary/vendor/lib64/libpowercore.so
deleted file mode 100644
index b4ca3df..0000000
Binary files a/proprietary/vendor/lib64/libpowercore.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libvideooptfeature.so b/proprietary/vendor/lib64/libvideooptfeature.so
deleted file mode 100644
index e8d1352..0000000
Binary files a/proprietary/vendor/lib64/libvideooptfeature.so and /dev/null differ