diff --git a/device-common.mk b/device-common.mk
index 62e8e70..5fe75ed 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -139,12 +139,6 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-service \
     android.hardware.drm@1.2-service.clearkey
 
-# Ebtables
-PRODUCT_PACKAGES += \
-    ebtables \
-    ethertypes \
-    libebtc
-
 # Flat device tree for boot image
 PRODUCT_HOST_PACKAGES += \
     dtbhtoolExynos
@@ -223,14 +217,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.radio@1.4 \
     android.hardware.radio.config@1.1 \
-    android.hardware.radio.deprecated@1.0 \
-    libxml2 \
-    libprotobuf-cpp-full \
-    rild \
-    libril \
-    libsecril-client \
-    libsecril-client-sap \
-    libreference-ril
+    libxml2
 
 # Ramdisk
 PRODUCT_PACKAGES += \
@@ -258,12 +245,12 @@ PRODUCT_COPY_FILES += \
 
 # Sensors
 PRODUCT_PACKAGES += \
-    android.hardware.sensors@1.0-impl \
-    android.hardware.thermal@1.0-service
+    android.hardware.sensors@1.0-impl
 
-# TextClassifier
+# Thermal
 PRODUCT_PACKAGES += \
-    textclassifier.bundle1
+    android.hardware.thermal@1.0-impl \
+    android.hardware.thermal@1.0-service
     
 # Touchscreen
 PRODUCT_COPY_FILES += \
@@ -271,11 +258,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/idc/qwerty.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/qwerty.idc \
     $(LOCAL_PATH)/configs/idc/qwerty2.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/qwerty2.idc
 
-# Thermal
-PRODUCT_PACKAGES += \
-    android.hardware.thermal@1.0-impl \
-    android.hardware.thermal@1.0-service
-
 # Touch features
 PRODUCT_PACKAGES += \
     vendor.lineage.touch@1.0-service.samsung
@@ -305,6 +287,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     libgui_vendor
 
+# Wifi
+PRODUCT_PACKAGES += \
+    macloader
+
 # WiFi Display
 PRODUCT_PACKAGES += \
     libnl
diff --git a/lineage.dependencies b/lineage.dependencies
index 16a46fd..e02c549 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,12 +1,5 @@
 [
-    {
-        "repository": "android_hardware_samsung",
-        "target_path": "hardware/samsung"
-    },
-    {
-        "repository": "android_kernel_samsung_exynos7870",
-        "target_path": "kernel/samsung/exynos7870"
-    },
+
     {
         "repository": "android_packages_resources_devicesettings",
         "target_path": "packages/resources/devicesettings"
diff --git a/vendor_prop.mk b/vendor_prop.mk
index 6c24394..0002565 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -51,7 +51,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.apm_sim_not_pwdn=1 \
     ro.smps.enable=true \
     telephony.lteOnCdmaDevice=0 \
-    ro.multisim.simslotcount=1
+    ro.multisim.simslotcount=2
 
 #Treble
 PRODUCT_PROPERTY_OVERRIDES += \