diff --git a/universal7885-common/Android.bp b/universal7885-common/Android.bp
index a0c7ee9..958d559 100644
--- a/universal7885-common/Android.bp
+++ b/universal7885-common/Android.bp
@@ -1,6 +1,5 @@
 soong_namespace {
     imports: [
-        "hardware/google/pixel",
-        "hardware/google/interfaces",
+        "hardware/samsung",
     ],
-}
\ No newline at end of file
+}
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 490b356..6da6f75 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -139,10 +139,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/keylayout/Codec3035_Headset_Events.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Codec3035_Headset_Events.kl \
     $(LOCAL_PATH)/configs/keylayout/uinput-sec-fp.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-sec-fp.kl
 
-# KeyLogger
-PRODUCT_PACKAGES += \
-    keyhandler
-
 # Keymaster
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@4.0-service.samsung \
@@ -285,9 +281,7 @@ PRODUCT_PACKAGES += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
-    hardware/google/interfaces \
-    hardware/google/pixel \
-    device/samsung/universal7885-common/aidl/power-libperfmgr
+    hardware/samsung
 
 # Sysconfig
 PRODUCT_COPY_FILES += \