diff --git a/device.mk b/device.mk
index 2b6f401e..5ebd23d0 100644
--- a/device.mk
+++ b/device.mk
@@ -827,8 +827,6 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
 
 PRODUCT_PACKAGES += ShannonIms
 
-$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk)
-
 #RCS Test Messaging App
 PRODUCT_PACKAGES_DEBUG += \
 	TestRcsApp
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index b8966b49..2e0eb721 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -146,7 +146,6 @@
     <string name="config_wlan_data_service_package">com.google.android.iwlan</string>
     <string name="config_wlan_network_service_package">com.google.android.iwlan</string>
     <bool name="config_wlan_data_service_conn_persistence_on_restart">false</bool>
-    <string name="config_qualified_networks_service_package">com.shannon.qualifiednetworksservice</string>
 
     <!-- Boolean indicating USSD over IMS is allowed.
      If it is not supported due to modem limitations, USSD send over the CS pipe instead.-->