diff --git a/modemmanager/Config.in b/modemmanager/Config.in
deleted file mode 100644
index ebcb60dbc..000000000
--- a/modemmanager/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_modemmanager
-
-config MODEMMANAGER_WITH_MBIM
-	bool "Include MBIM support"
-	default y
-	help
-	  Compile ModemManager with MBIM support
-
-config MODEMMANAGER_WITH_QMI
-	bool "Include QMI support"
-	default y
-	help
-	  Compile ModemManager with QMI support
-
-config MODEMMANAGER_WITH_QRTR
-	bool "Include QRTR support"
-	default y
-	depends on MODEMMANAGER_WITH_QMI
-	select LIBQMI_WITH_QRTR_GLIB
-	help
-	  Compile ModemManager with QRTR support
-
-config MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS
-	bool "Allow AT commands via DBus"
-	default n
-	help
-	  Compile ModemManager allowing AT commands without debug flag
-
-endmenu
diff --git a/modemmanager/Makefile b/modemmanager/Makefile
deleted file mode 100644
index ba8497132..000000000
--- a/modemmanager/Makefile
+++ /dev/null
@@ -1,136 +0,0 @@
-#
-# Copyright (C) 2016 Velocloud Inc.
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-#
-# This is free software, licensed under the GNU General Public License v2.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=modemmanager
-PKG_SOURCE_VERSION:=48e661579cfc3b3f4ee0d93615ac024f3e0689a1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
-PKG_MIRROR_HASH:=skip
-
-PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DEPENDS:=glib2/host libxslt/host
-PKG_BUILD_FLAGS:=gc-sections
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/meson.mk
-
-TARGET_CFLAGS += -fno-merge-all-constants -fmerge-constants
-
-define Package/modemmanager/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/modemmanager
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Control utility for any kind of mobile broadband modem
-  URL:=https://www.freedesktop.org/wiki/Software/ModemManager
-  DEPENDS:= \
-	$(INTL_DEPENDS) \
-	+glib2 \
-	+dbus \
-	+ppp \
-	+MODEMMANAGER_WITH_MBIM:libmbim \
-	+MODEMMANAGER_WITH_QMI:libqmi \
-	+MODEMMANAGER_WITH_QRTR:libqrtr-glib
-endef
-
-define Package/modemmanager/description
-  ModemManager is a D-Bus-activated service which allows controlling mobile
-  broadband modems. Add kernel modules for your modems as needed.
-  Select Utilities/usb-modeswitch if needed.
-endef
-
-MESON_ARGS += \
-	-Dudev=false \
-	-Dudevdir=/lib/udev \
-	-Dtests=false \
-	-Dsystemdsystemunitdir=no \
-	-Dsystemd_suspend_resume=false \
-	-Dsystemd_journal=false \
-	-Dpolkit=no \
-	-Dintrospection=false \
-	-Dman=false \
-	-Dbash_completion=false \
-	-Dbuiltin_plugins=true \
-	-Db_lto=true \
-	-Dmbim=$(if $(CONFIG_MODEMMANAGER_WITH_MBIM),true,false) \
-	-Dqmi=$(if $(CONFIG_MODEMMANAGER_WITH_QMI),true,false) \
-	-Dqrtr=$(if $(CONFIG_MODEMMANAGER_WITH_QRTR),true,false) \
-	-Dat_command_via_dbus=$(if $(CONFIG_MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS),true,false)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/ModemManager
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ModemManager/*.h $(1)/usr/include/ModemManager
-	$(INSTALL_DIR) $(1)/usr/include/libmm-glib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmm-glib/*.h $(1)/usr/include/libmm-glib
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ModemManager.pc $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mm-glib.pc $(1)/usr/lib/pkgconfig
-	$(INSTALL_DIR) $(1)/usr/share/dbus-1/interfaces
-	$(CP) $(PKG_BUILD_DIR)/introspection/org.freedesktop.ModemManager1.* $(1)/usr/share/dbus-1/interfaces
-endef
-
-define Package/modemmanager/install
-	$(INSTALL_DIR) $(1)/lib/udev/rules.d
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/udev/rules.d/*.rules $(1)/lib/udev/rules.d
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ModemManager $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin
-
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so.* $(1)/usr/lib
-
-	$(INSTALL_DIR) $(1)/usr/lib/ModemManager/connection.d
-	$(INSTALL_BIN) ./files/10-report-down $(1)/usr/lib/ModemManager/connection.d
-
-	$(INSTALL_DIR) $(1)/etc/dbus-1/system.d
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf $(1)/etc/dbus-1/system.d
-
-	$(INSTALL_DIR) $(1)/usr/share/dbus-1/system-services
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service $(1)/usr/share/dbus-1/system-services
-
-	$(INSTALL_DIR) $(1)/usr/share/ModemManager
-	$$(if $$(wildcard $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf),$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager,)
-	$(INSTALL_DATA) ./files/modemmanager.common $(1)/usr/share/ModemManager
-
-	$(INSTALL_DIR) $(1)/usr/share/ModemManager/fcc-unlock.available.d
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/fcc-unlock.available.d/* $(1)/usr/share/ModemManager/fcc-unlock.available.d
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
-	$(INSTALL_DATA) ./files/25-modemmanager-usb $(1)/etc/hotplug.d/usb
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/net
-	$(INSTALL_DATA) ./files/25-modemmanager-net $(1)/etc/hotplug.d/net
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/tty
-	$(INSTALL_DATA) ./files/25-modemmanager-tty $(1)/etc/hotplug.d/tty
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/wwan
-	$(INSTALL_DATA) ./files/25-modemmanager-wwan $(1)/etc/hotplug.d/wwan
-
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/modemmanager.proto $(1)/lib/netifd/proto/modemmanager.sh
-endef
-
-$(eval $(call BuildPackage,modemmanager))
diff --git a/modemmanager/README.md b/modemmanager/README.md
deleted file mode 100644
index 93a7f9b09..000000000
--- a/modemmanager/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# OpenWrt ModemManager
-
-## Description
-
-Cellular modem control and connectivity
-
-Optional libraries libmbim and libqmi are available.
-Your modem may require additional kernel modules and/or the usb-modeswitch
-package.
-
-## Usage
-
-Once installed, you can configure the 2G/3G/4G modem connections directly in
-/etc/config/network as in the following example:
-
-    config interface 'broadband'
-        option device      '/sys/devices/platform/soc/20980000.usb/usb1/1-1/1-1.2/1-1.2.1'
-        option proto       'modemmanager'
-        option apn         'ac.vodafone.es'
-        option allowedauth 'pap chap'
-        option username    'vodafone'
-        option password    'vodafone'
-        option pincode     '7423'
-        option iptype      'ipv4'
-        option plmn        '214001'
-        option lowpower    '1'
-        option signalrate  '30'
-        option allow_roaming '1'
-
-Only 'device' and 'proto' are mandatory options, the remaining ones are all
-optional.
-
-The 'allowedauth' option allows limiting the list of authentication protocols.
-It is given as a space-separated list of values, including any of the
-following: 'pap', 'chap', 'mschap', 'mschapv2' or 'eap'. It will default to
-allowing all protocols.
-
-The 'iptype' option supports any of these values: 'ipv4', 'ipv6' or 'ipv4v6'.
-It will default to 'ipv4' if not given.
-
-The 'plmn' option allows to set the network operator MCCMNC.
-
-The 'signalrate' option set's the signal refresh rate (in seconds) for the device.
-You can call signal info with command: mmcli -m 0 --signal-get
diff --git a/modemmanager/files/10-report-down b/modemmanager/files/10-report-down
deleted file mode 100755
index 88b010cf0..000000000
--- a/modemmanager/files/10-report-down
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: CC0-1.0
-# 2022 Aleksander Morgado <aleksander@aleksander.es>
-#
-# Automatically report to netifd that the underlying modem
-# is really disconnected
-#
-# require program name and at least 4 arguments
-[ $# -lt 4 ] && exit 1
-
-MODEM_PATH="$1"
-BEARER_PATH="$2"
-INTERFACE="$3"
-STATE="$4"
-
-[ "${STATE}" = "disconnected" ] || exit 0
-
-. /usr/share/ModemManager/modemmanager.common
-. /lib/netifd/netifd-proto.sh
-INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
-
-MODEM_STATUS=$(mmcli --modem="${MODEM_PATH}" --output-keyvalue)
-[ -n "${MODEM_STATUS}" ] || exit 1
-
-MODEM_DEVICE=$(modemmanager_get_field "${MODEM_STATUS}" "modem.generic.device")
-[ -n "${MODEM_DEVICE}" ] || exit 2
-
-CFG=$(mm_get_modem_config "${MODEM_DEVICE}")
-[ -n "${CFG}" ] || exit 3
-
-IFUP=$(ifstatus "${CFG}" | jsonfilter -e "@.up")
-
-[ "${IFUP}" = "true" ] && {
-	logger -t "modemmanager" "interface ${CFG} (network device ${INTERFACE}) ${STATE}"
-	proto_init_update $INTERFACE 0
-	proto_send_update $CFG
-}
-
-exit 0
diff --git a/modemmanager/files/25-modemmanager-net b/modemmanager/files/25-modemmanager-net
deleted file mode 100644
index ff4642019..000000000
--- a/modemmanager/files/25-modemmanager-net
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Velocloud Inc
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-# Load common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-# We require a interface name
-[ -n "${INTERFACE}" ] || exit
-
-# Always make sure the rundir exists
-mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}"
-
-# Report network interface
-mm_log "info" "${ACTION} network interface ${INTERFACE}: event processed"
-mm_report_event "${ACTION}" "${INTERFACE}" "net" "/sys${DEVPATH}"
-
-# Look for an associated cdc-wdm interface
-
-cdcwdm=""
-
-case "${ACTION}" in
-	"add")	  cdcwdm=$(mm_track_cdcwdm "${INTERFACE}") ;;
-	"remove") cdcwdm=$(mm_untrack_cdcwdm "${INTERFACE}") ;;
-esac
-
-# Report cdc-wdm device, if any
-[ -n "${cdcwdm}" ] && {
-	mm_log "info" "${ACTION} cdc interface ${cdcwdm}: custom event processed"
-	mm_report_event "${ACTION}" "${cdcwdm}" "usbmisc" "/sys${DEVPATH}"
-}
diff --git a/modemmanager/files/25-modemmanager-tty b/modemmanager/files/25-modemmanager-tty
deleted file mode 100644
index 5d1042cdd..000000000
--- a/modemmanager/files/25-modemmanager-tty
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Velocloud Inc
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-# Load hotplug common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-# We require a device name
-[ -n "$DEVNAME" ] || exit
-
-# Always make sure the rundir exists
-mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}"
-
-# Report TTY
-mm_log "info" "${ACTION} serial interface ${DEVNAME}: event processed"
-mm_report_event "${ACTION}" "${DEVNAME}" "tty" "/sys${DEVPATH}"
diff --git a/modemmanager/files/25-modemmanager-usb b/modemmanager/files/25-modemmanager-usb
deleted file mode 100644
index 93d0bf70a..000000000
--- a/modemmanager/files/25-modemmanager-usb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
-
-# We need to process only full USB device removal events, we don't
-# want to process specific interface removal events.
-[ "$ACTION" = remove ] || exit
-[ -z "${INTERFACE}" ] || exit
-
-# Load common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-mm_clear_modem_wait_status "/sys${DEVPATH}"
-mm_cleanup_interface_by_sysfspath "/sys${DEVPATH}"
diff --git a/modemmanager/files/25-modemmanager-wwan b/modemmanager/files/25-modemmanager-wwan
deleted file mode 100644
index b36ade478..000000000
--- a/modemmanager/files/25-modemmanager-wwan
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2021 Aleksander Morgado <aleksander@aleksander.es>
-
-# Load hotplug common utilities
-. /usr/share/ModemManager/modemmanager.common
-
-# We require a device name
-[ -n "$DEVNAME" ] || exit
-
-# Always make sure the rundir exists
-mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}"
-
-# Report wwan
-mm_log "info" "${ACTION} wwan control port ${DEVNAME}: event processed"
-mm_report_event "${ACTION}" "${DEVNAME}" "wwan" "/sys${DEVPATH}"
diff --git a/modemmanager/files/modemmanager.common b/modemmanager/files/modemmanager.common
deleted file mode 100644
index 2ba2036ce..000000000
--- a/modemmanager/files/modemmanager.common
+++ /dev/null
@@ -1,353 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Velocloud Inc
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-################################################################################
-
-. /lib/functions.sh
-. /lib/netifd/netifd-proto.sh
-INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
-
-################################################################################
-# Runtime state
-
-MODEMMANAGER_RUNDIR="/var/run/modemmanager"
-MODEMMANAGER_PID_FILE="${MODEMMANAGER_RUNDIR}/modemmanager.pid"
-MODEMMANAGER_CDCWDM_CACHE="${MODEMMANAGER_RUNDIR}/cdcwdm.cache"
-MODEMMANAGER_SYSFS_CACHE="${MODEMMANAGER_RUNDIR}/sysfs.cache"
-MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"
-
-################################################################################
-# Common logging
-
-mm_log() {
-	local level="$1"; shift
-	logger -p "daemon.${level}" -t "ModemManager[$$]" "hotplug: $*"
-}
-
-################################################################################
-# Receives as input argument the full sysfs path of the device
-# Returns the physical device sysfs path
-#
-# NOTE: this method only works when the device exists, i.e. it cannot be used
-# on removal hotplug events
-
-mm_find_physdev_sysfs_path() {
-	local tmp_path="$1"
-
-	while true; do
-		tmp_path=$(dirname "${tmp_path}")
-
-		# avoid infinite loops iterating
-		[ -z "${tmp_path}" ] || [ "${tmp_path}" = "/" ] && return
-
-		# For USB devices, the physical device will be that with a idVendor
-		# and idProduct pair of files
-		[ -f "${tmp_path}"/idVendor ] && [ -f "${tmp_path}"/idProduct ] && {
-			tmp_path=$(readlink -f "$tmp_path")
-			echo "${tmp_path}"
-			return
-		}
-
-		# For PCI devices, the physical device will be that with a vendor
-		# and device pair of files
-		[ -f "${tmp_path}"/vendor ] && [ -f "${tmp_path}"/device ] && {
-			tmp_path=$(readlink -f "$tmp_path")
-			echo "${tmp_path}"
-			return
-		}
-	done
-}
-
-################################################################################
-
-# Returns the cdc-wdm name retrieved from sysfs
-mm_track_cdcwdm() {
-	local wwan="$1"
-	local cdcwdm
-
-	cdcwdm=$(ls "/sys/class/net/${wwan}/device/usbmisc/")
-	[ -n "${cdcwdm}" ] || return
-
-	# We have to cache it for later, as we won't be able to get the
-	# associated cdc-wdm device on a remove event
-	echo "${wwan} ${cdcwdm}" >> "${MODEMMANAGER_CDCWDM_CACHE}"
-
-	echo "${cdcwdm}"
-}
-
-# Returns the cdc-wdm name retrieved from the cache
-mm_untrack_cdcwdm() {
-	local wwan="$1"
-	local cdcwdm
-
-	# Look for the cached associated cdc-wdm device
-	[ -f "${MODEMMANAGER_CDCWDM_CACHE}" ] || return
-
-	cdcwdm=$(awk -v wwan="${wwan}" '!/^#/ && $0 ~ wwan { print $2 }' "${MODEMMANAGER_CDCWDM_CACHE}")
-	[ -n "${cdcwdm}" ] || return
-
-	# Remove from cache
-	sed -i "/${wwan} ${cdcwdm}/d" "${MODEMMANAGER_CDCWDM_CACHE}"
-
-	echo "${cdcwdm}"
-}
-
-################################################################################
-# ModemManager needs some time from the ports being added until a modem object
-# is exposed in DBus. With the logic here we do an explicit wait of N seconds
-# for ModemManager to expose the new modem object, making sure that the wait is
-# unique per device (i.e. per physical device sysfs path).
-
-# Gets the modem wait status as retrieved from the cache
-mm_get_modem_wait_status() {
-	local sysfspath="$1"
-
-	# If no sysfs cache file, we're done
-	[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] || return
-
-	# Get status of the sysfs path
-	awk -v sysfspath="${sysfspath}" '!/^#/ && $0 ~ sysfspath { print $2 }' "${MODEMMANAGER_SYSFS_CACHE}"
-}
-
-# Clear the modem wait status from the cache, if any
-mm_clear_modem_wait_status() {
-	local sysfspath="$1"
-
-	local escaped_sysfspath
-
-	[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] && {
-		# escape '/', '\' and '&' for sed...
-		escaped_sysfspath=$(echo "$sysfspath" | sed -e 's/[\/&]/\\&/g')
-		sed -i "/${escaped_sysfspath}/d" "${MODEMMANAGER_SYSFS_CACHE}"
-	}
-}
-
-# Sets the modem wait status in the cache
-mm_set_modem_wait_status() {
-	local sysfspath="$1"
-	local status="$2"
-
-	# Remove sysfs line before adding the new one with the new state
-	mm_clear_modem_wait_status "${sysfspath}"
-
-	# Add the new status
-	echo "${sysfspath} ${status}" >> "${MODEMMANAGER_SYSFS_CACHE}"
-}
-
-# Callback for config_foreach()
-mm_get_modem_config_foreach_cb() {
-	local cfg="$1"
-	local sysfspath="$2"
-
-	local dev
-	dev=$(uci_get network "${cfg}" device)
-	[ "${dev}" = "${sysfspath}" ] || return 0
-
-	echo "${cfg}"
-}
-
-# Returns the name of the interface configured for this device
-mm_get_modem_config() {
-	local sysfspath="$1"
-
-	# Look for configuration for the given sysfs path
-	config_load network
-	config_foreach mm_get_modem_config_foreach_cb interface "${sysfspath}"
-}
-
-# Wait for a modem in the specified sysfspath
-mm_wait_for_modem() {
-	local cfg="$1"
-	local sysfspath="$2"
-
-	# TODO: config max wait
-	local n=45
-	local step=5
-
-	while [ $n -ge 0 ]; do
-		[ -d "${sysfspath}" ] || {
-			mm_log "error" "ignoring modem detection request: no device at ${sysfspath}"
-			proto_set_available "${cfg}" 0
-			return 1
-		}
-
-		# Check if the modem exists at the given sysfs path
-		if ! mmcli -m "${sysfspath}" > /dev/null 2>&1
-		then
-			mm_log "error" "modem not detected at sysfs path"
-		else
-			mm_log "info" "modem exported successfully at ${sysfspath}"
-			mm_log "info" "setting interface '${cfg}' as available"
-			proto_set_available "${cfg}" 1
-			return 0
-		fi
-
-		sleep $step
-		n=$((n-step))
-	done
-
-	mm_log "error" "timed out waiting for the modem to get exported at ${sysfspath}"
-	proto_set_available "${cfg}" 0
-	return 2
-}
-
-mm_report_modem_wait() {
-	local sysfspath=$1
-
-	local parent_sysfspath status
-
-	parent_sysfspath=$(mm_find_physdev_sysfs_path "$sysfspath")
-	[ -n "${parent_sysfspath}" ] || {
-		mm_log "error" "parent device sysfspath not found"
-		return
-	}
-
-	status=$(mm_get_modem_wait_status "${parent_sysfspath}")
-	case "${status}" in
-		"")
-			local cfg
-
-			cfg=$(mm_get_modem_config "${parent_sysfspath}")
-			if [ -n "${cfg}" ]; then
-				mm_log "info" "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
-				mm_log "info" "now waiting for modem at sysfs path ${parent_sysfspath}"
-				mm_set_modem_wait_status "${parent_sysfspath}" "processed"
-				# Launch subshell for the explicit wait
-				( mm_wait_for_modem "${cfg}" "${parent_sysfspath}" ) > /dev/null 2>&1 &
-			else
-				mm_log "info" "no need to wait for modem at sysfs path ${parent_sysfspath}"
-				mm_set_modem_wait_status "${parent_sysfspath}" "ignored"
-			fi
-			;;
-		"processed")
-			mm_log "info" "already waiting for modem at sysfs path ${parent_sysfspath}"
-			;;
-		"ignored")
-			;;
-		*)
-			mm_log "error" "unknown status read for device at sysfs path ${parent_sysfspath}"
-			;;
-	esac
-}
-
-################################################################################
-# Cleanup interfaces
-
-mm_cleanup_interfaces() {
-	local sysfs_path status
-
-	# Do nothing if there is no sysfs cache
-	[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] || return
-
-	while IFS= read -r sysfs_cache_line; do
-		sysfs_path=$(echo "${sysfs_cache_line}" | awk '{print $1}')
-		status=$(echo "${sysfs_cache_line}" | awk '{print $2}')
-
-		if [ "${status}" = "processed" ]; then
-			mm_log "debug" "call cleanup for: ${sysfs_path}"
-			mm_cleanup_interface_by_sysfspath "${sysfs_path}"
-		fi
-	done < ${MODEMMANAGER_SYSFS_CACHE}
-}
-
-mm_cleanup_interface_by_sysfspath() {
-	local dev="$1"
-
-	local cfg
-	cfg=$(mm_get_modem_config "$dev")
-	[ -n "${cfg}" ] || return
-
-	mm_log "info" "setting interface '$cfg' as unavailable"
-	proto_set_available "${cfg}" 0
-}
-
-################################################################################
-# Event reporting
-
-# Receives as input the action, the device name and the subsystem
-mm_report_event() {
-	local action="$1"
-	local name="$2"
-	local subsystem="$3"
-	local sysfspath="$4"
-
-	# Do not save virtual devices
-	local virtual result
-	virtual="$(echo "$sysfspath" | cut -d'/' -f4)"
-	[ "$virtual" = "virtual" ] && {
-		mm_log "debug" "sysfspath is a virtual device ($sysfspath)"
-		return
-	}
-
-	# Track/untrack events in cache
-	case "${action}" in
-		"add")
-			# On add events, store event details in cache (if not exists yet)
-			grep -qs "${name},${subsystem}" "${MODEMMANAGER_EVENTS_CACHE}" || \
-				echo "${action},${name},${subsystem},${sysfspath}" >> "${MODEMMANAGER_EVENTS_CACHE}"
-			;;
-		"remove")
-			# On remove events, remove old events from cache (match by subsystem+name)
-			sed -i "/${name},${subsystem}/d" "${MODEMMANAGER_EVENTS_CACHE}"
-			;;
-	esac
-
-	# Report the event
-	mm_log "debug" "Report event: action=${action}, name=${name}, subsystem=${subsystem}"
-	result=$(mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 2>&1)
-	if [ "$?" -eq "0" ]; then
-		# Wait for added modem if a sysfspath is given
-		[ -n "${sysfspath}" ] && [ "$action" = "add" ] && mm_report_modem_wait "${sysfspath}"
-	else
-		mm_log "error" "Couldn't report kernel event: ${result}"
-	fi
-
-}
-
-mm_report_event_from_cache_line() {
-	local event_line="$1"
-
-	local action name subsystem sysfspath
-	action=$(echo "${event_line}" | awk -F ',' '{ print $1 }')
-	name=$(echo "${event_line}" | awk -F ',' '{ print $2 }')
-	subsystem=$(echo "${event_line}" | awk -F ',' '{ print $3 }')
-	sysfspath=$(echo "${event_line}" | awk -F ',' '{ print $4 }')
-
-	mm_log "debug" "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
-	mm_report_event "${action}" "${name}" "${subsystem}" "${sysfspath}"
-}
-
-mm_report_events_from_cache() {
-	local n=60
-	local step=1
-	local mmrunning=0
-
-	# Wait for ModemManager to be available in the bus
-	while [ $n -ge 0 ]; do
-		sleep $step
-		mm_log "info" "checking if ModemManager is available..."
-
-		if ! mmcli -L >/dev/null 2>&1
-		then
-			mm_log "info" "ModemManager not yet available"
-		else
-			mmrunning=1
-			break
-		fi
-		n=$((n-step))
-	done
-
-	[ ${mmrunning} -eq 1 ] || {
-		mm_log "error" "couldn't report initial kernel events: ModemManager not running"
-		return
-	}
-
-	# Remove the sysfs cache
-	rm -f "${MODEMMANAGER_SYSFS_CACHE}"
-
-	# Report cached kernel events
-	while IFS= read -r event_line; do
-		mm_report_event_from_cache_line "${event_line}"
-	done < ${MODEMMANAGER_EVENTS_CACHE}
-}
diff --git a/modemmanager/files/modemmanager.init b/modemmanager/files/modemmanager.init
deleted file mode 100755
index a036d884d..000000000
--- a/modemmanager/files/modemmanager.init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
-
-USE_PROCD=1
-START=70
-
-LOG_LEVEL="INFO"
-
-start_service() {
-	# Setup ModemManager service
-	#
-	# We will make sure that the rundir always exists, and we initially cleanup
-	# all interfaces flagging them as unavailable.
-	#
-	# The cached events processing will wait for MM to be available in DBus
-	# and will make sure all ports are re-notified to ModemManager every time
-	# it starts.
-	#
-	# All these commands need to be executed on every MM start, even after
-	# procd-triggered respawns, which is why this is wrapped in a startup
-	# wrapper script called '/usr/sbin/ModemManager-wrapper'.
-	#
-	. /usr/share/ModemManager/modemmanager.common
-	procd_open_instance
-	procd_set_param command /usr/sbin/ModemManager-wrapper
-	procd_append_param command --log-level="$LOG_LEVEL"
-	[ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --debug
-	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
-	procd_set_param pidfile "${MODEMMANAGER_PID_FILE}"
-	procd_close_instance
-}
diff --git a/modemmanager/files/modemmanager.proto b/modemmanager/files/modemmanager.proto
deleted file mode 100755
index a4d837c1e..000000000
--- a/modemmanager/files/modemmanager.proto
+++ /dev/null
@@ -1,637 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016-2019 Aleksander Morgado <aleksander@aleksander.es>
-
-[ -x /usr/bin/mmcli ] || exit 0
-[ -x /usr/sbin/pppd ] || exit 0
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. ../netifd-proto.sh
-	. ./ppp.sh
-	init_proto "$@"
-}
-
-cdr2mask ()
-{
-	# Number of args to shift, 255..255, first non-255 byte, zeroes
-	set -- $(( 5 - ($1 / 8) )) 255 255 255 255 $(( (255 << (8 - ($1 % 8))) & 255 )) 0 0 0
-	if [ "$1" -gt 1 ]
-	then
-		shift "$1"
-	else
-		shift
-	fi
-	echo "${1-0}"."${2-0}"."${3-0}"."${4-0}"
-}
-
-# This method expects as first argument a list of key-value pairs, as returned by mmcli --output-keyvalue
-# The second argument must be exactly the name of the field to read
-#
-# Sample output:
-#     $ mmcli -m 0 -K
-#     modem.dbus-path                                 : /org/freedesktop/ModemManager1/Modem/0
-#     modem.generic.device-identifier                 : ed6eff2e3e0f90463da1c2a755b2acacd1335752
-#     modem.generic.manufacturer                      : Dell Inc.
-#     modem.generic.model                             : DW5821e Snapdragon X20 LTE
-#     modem.generic.revision                          : T77W968.F1.0.0.4.0.GC.009\n026
-#     modem.generic.carrier-configuration             : GCF
-#     modem.generic.carrier-configuration-revision    : 08E00009
-#     modem.generic.hardware-revision                 : DW5821e Snapdragon X20 LTE
-#     ....
-modemmanager_get_field() {
-	local list=$1
-	local field=$2
-	local value=""
-
-	[ -z "${list}" ] || [ -z "${field}" ] && return
-
-	# there is always at least a whitespace after each key, and we use that as part of the
-	# key matching we do (e.g. to avoid getting 'modem.generic.state-failed-reason' as a result
-	# when grepping for 'modem.generic.state'.
-	line=$(echo "${list}" | grep "${field} ")
-	value=$(echo ${line#*:})
-
-	# not found?
-	[ -n "${value}" ] || return 2
-
-	# only print value if set
-	[ "${value}" != "--" ] && echo "${value}"
-	return 0
-}
-
-# build a comma-separated list of values from the list
-modemmanager_get_multivalue_field() {
-	local list=$1
-	local field=$2
-	local value=""
-	local length idx item
-
-	[ -z "${list}" ] || [ -z "${field}" ] && return
-
-	length=$(modemmanager_get_field "${list}" "${field}.length")
-	[ -n "${length}" ] || return 0
-	[ "$length" -ge 1 ] || return 0
-
-	idx=1
-	while [ $idx -le "$length" ]; do
-		item=$(modemmanager_get_field "${list}" "${field}.value\[$idx\]")
-		[ -n "${item}" ] && [ "${item}" != "--" ] && {
-			[ -n "${value}" ] && value="${value}, "
-			value="${value}${item}"
-		}
-		idx=$((idx + 1))
-	done
-
-	# nothing built?
-	[ -n "${value}" ] || return 2
-
-	# only print value if set
-	echo "${value}"
-	return 0
-}
-
-modemmanager_cleanup_connection() {
-	local modemstatus="$1"
-
-	local bearercount idx bearerpath
-
-	bearercount=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.length")
-
-	# do nothing if no bearers reported
-	[ -n "${bearercount}" ] && [ "$bearercount" -ge 1 ] && {
-		# explicitly disconnect just in case
-		mmcli --modem="${device}" --simple-disconnect >/dev/null 2>&1
-		# and remove all bearer objects, if any found
-		idx=1
-		while [ $idx -le "$bearercount" ]; do
-			bearerpath=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.value\[$idx\]")
-			mmcli --modem "${device}" --delete-bearer="${bearerpath}" >/dev/null 2>&1
-			idx=$((idx + 1))
-		done
-	}
-}
-
-modemmanager_connected_method_ppp_ipv4() {
-	local interface="$1"
-	local ttyname="$2"
-	local username="$3"
-	local password="$4"
-	local allowedauth="$5"
-
-	# all auth types are allowed unless a user given list is given
-	local authopts
-	local pap=1
-	local chap=1
-	local mschap=1
-	local mschapv2=1
-	local eap=1
-
-	[ -n "$allowedauth" ] && {
-		pap=0 chap=0 mschap=0 mschapv2=0 eap=0
-		for auth in $allowedauth; do
-			case $auth in
-				"pap") pap=1 ;;
-				"chap") chap=1 ;;
-				"mschap") mschap=1 ;;
-				"mschapv2") mschapv2=1 ;;
-				"eap") eap=1 ;;
-				*) ;;
-			esac
-		done
-	}
-
-	[ $pap -eq 1 ] || append authopts "refuse-pap"
-	[ $chap -eq 1 ] || append authopts "refuse-chap"
-	[ $mschap -eq 1 ] || append authopts "refuse-mschap"
-	[ $mschapv2 -eq 1 ] || append authopts "refuse-mschap-v2"
-	[ $eap -eq 1 ] || append authopts "refuse-eap"
-
-	proto_run_command "${interface}" /usr/sbin/pppd \
-		"${ttyname}" \
-		115200 \
-		nodetach \
-		noaccomp \
-		nobsdcomp \
-		nopcomp \
-		novj \
-		noauth \
-		$authopts \
-		${username:+ user "$username"} \
-		${password:+ password "$password"} \
-		lcp-echo-failure 5 \
-		lcp-echo-interval 15 \
-		lock \
-		crtscts \
-		nodefaultroute \
-		usepeerdns \
-		ipparam "${interface}" \
-		ip-up-script /lib/netifd/ppp-up \
-		ip-down-script /lib/netifd/ppp-down
-}
-
-modemmanager_disconnected_method_ppp_ipv4() {
-	local interface="$1"
-
-	echo "running disconnection (ppp method)"
-
-	[ -n "${ERROR}" ] && {
-		local errorstring
-		errorstring=$(ppp_exitcode_tostring "${ERROR}")
-		case "$ERROR" in
-			0)
-				;;
-			2)
-				proto_notify_error "$interface" "$errorstring"
-				proto_block_restart "$interface"
-				;;
-			*)
-				proto_notify_error "$interface" "$errorstring"
-				;;
-		esac
-	} || echo "pppd result code not given"
-
-	proto_kill_command "$interface"
-}
-
-modemmanager_connected_method_dhcp_ipv4() {
-	local interface="$1"
-	local wwan="$2"
-	local metric="$3"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	proto_send_update "${interface}"
-
-	json_init
-	json_add_string name "${interface}_4"
-	json_add_string ifname "@${interface}"
-	json_add_string proto "dhcp"
-	proto_add_dynamic_defaults
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	json_close_object
-	ubus call network add_dynamic "$(json_dump)"
-}
-
-modemmanager_connected_method_static_ipv4() {
-	local interface="$1"
-	local wwan="$2"
-	local address="$3"
-	local prefix="$4"
-	local gateway="$5"
-	local mtu="$6"
-	local dns1="$7"
-	local dns2="$8"
-	local metric="$9"
-
-	local mask=""
-
-	[ -n "${address}" ] || {
-		proto_notify_error "${interface}" ADDRESS_MISSING
-		return
-	}
-
-	[ -n "${prefix}" ] || {
-		proto_notify_error "${interface}" PREFIX_MISSING
-		return
-	}
-	mask=$(cdr2mask "${prefix}")
-
-	[ -n "${mtu}" ] && /sbin/ip link set dev "${wwan}" mtu "${mtu}"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	echo "adding IPv4 address ${address}, netmask ${mask}"
-	proto_add_ipv4_address "${address}" "${mask}"
-	[ -n "${gateway}" ] && {
-		echo "adding default IPv4 route via ${gateway}"
-		proto_add_ipv4_route "0.0.0.0" "0" "${gateway}" "${address}"
-	}
-	[ -n "${dns1}" ] && {
-		echo "adding primary DNS at ${dns1}"
-		proto_add_dns_server "${dns1}"
-	}
-	[ -n "${dns2}" ] && {
-		echo "adding secondary DNS at ${dns2}"
-		proto_add_dns_server "${dns2}"
-	}
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	proto_send_update "${interface}"
-}
-
-modemmanager_connected_method_dhcp_ipv6() {
-	local interface="$1"
-	local wwan="$2"
-	local metric="$3"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	proto_send_update "${interface}"
-
-	json_init
-	json_add_string name "${interface}_6"
-	json_add_string ifname "@${interface}"
-	json_add_string proto "dhcpv6"
-	proto_add_dynamic_defaults
-	json_add_string extendprefix 1 # RFC 7278: Extend an IPv6 /64 Prefix to LAN
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	json_close_object
-	ubus call network add_dynamic "$(json_dump)"
-}
-
-modemmanager_connected_method_static_ipv6() {
-	local interface="$1"
-	local wwan="$2"
-	local address="$3"
-	local prefix="$4"
-	local gateway="$5"
-	local mtu="$6"
-	local dns1="$7"
-	local dns2="$8"
-	local metric="$9"
-
-	[ -n "${address}" ] || {
-		proto_notify_error "${interface}" ADDRESS_MISSING
-		return
-	}
-
-	[ -n "${prefix}" ] || {
-		proto_notify_error "${interface}" PREFIX_MISSING
-		return
-	}
-
-	[ -n "${mtu}" ] && /sbin/ip link set dev "${wwan}" mtu "${mtu}"
-
-	proto_init_update "${wwan}" 1
-	proto_set_keep 1
-	echo "adding IPv6 address ${address}, prefix ${prefix}"
-	proto_add_ipv6_address "${address}" "128"
-	proto_add_ipv6_prefix "${address}/${prefix}"
-	[ -n "${gateway}" ] && {
-		echo "adding default IPv6 route via ${gateway}"
-		proto_add_ipv6_route "${gateway}" "128"
-		proto_add_ipv6_route "::0" "0" "${gateway}" "" "" "${address}/${prefix}"
-	}
-	[ -n "${dns1}" ] && {
-		echo "adding primary DNS at ${dns1}"
-		proto_add_dns_server "${dns1}"
-	}
-	[ -n "${dns2}" ] && {
-		echo "adding secondary DNS at ${dns2}"
-		proto_add_dns_server "${dns2}"
-	}
-	[ -n "$metric" ] && json_add_int metric "${metric}"
-	proto_send_update "${interface}"
-}
-
-proto_modemmanager_init_config() {
-	available=1
-	no_device=1
-	proto_config_add_string device
-	proto_config_add_string apn
-	proto_config_add_string 'allowedauth:list(string)'
-	proto_config_add_string username
-	proto_config_add_string password
-	proto_config_add_string allowedmode
-	proto_config_add_string preferredmode
-	proto_config_add_string pincode
-	proto_config_add_string iptype
-	proto_config_add_string plmn
-	proto_config_add_int signalrate
-	proto_config_add_boolean lowpower
-	proto_config_add_boolean allow_roaming
-	proto_config_add_defaults
-}
-
-# Append param to the global 'connectargs' variable.
-append_param() {
-	local param="$1"
-
-	[ -z "$param" ] && return
-	[ -z "$connectargs" ] || connectargs="${connectargs},"
-	connectargs="${connectargs}${param}"
-}
-
-modemmanager_set_allowed_mode() {
-	local device="$1"
-	local interface="$2"
-	local allowedmode="$3"
-
-	echo "setting allowed mode to '${allowedmode}'"
-	mmcli --modem="${device}" --set-allowed-modes="${allowedmode}" || {
-		proto_notify_error "${interface}" MM_INVALID_ALLOWED_MODES_LIST
-		proto_block_restart "${interface}"
-		return 1
-	}
-}
-
-modemmanager_set_preferred_mode() {
-	local device="$1"
-	local interface="$2"
-	local allowedmode="$3"
-	local preferredmode="$4"
-
-	[ -z "${preferredmode}" ] && {
-		echo "no preferred mode configured"
-		proto_notify_error "${interface}" MM_NO_PREFERRED_MODE_CONFIGURED
-		proto_block_restart "${interface}"
-		return 1
-	}
-
-	[ -z "${allowedmode}" ] && {
-		echo "no allowed mode configured"
-		proto_notify_error "${interface}" MM_NO_ALLOWED_MODE_CONFIGURED
-		proto_block_restart "${interface}"
-		return 1
-	}
-
-	echo "setting preferred mode to '${preferredmode}' (${allowedmode})"
-	mmcli --modem="${device}" \
-		--set-preferred-mode="${preferredmode}" \
-		--set-allowed-modes="${allowedmode}" || {
-		proto_notify_error "${interface}" MM_FAILED_SETTING_PREFERRED_MODE
-		proto_block_restart "${interface}"
-		return 1
-	}
-}
-
-proto_modemmanager_setup() {
-	local interface="$1"
-
-	local modempath modemstatus bearercount bearerpath connectargs bearerstatus beareriface
-	local bearermethod_ipv4 bearermethod_ipv6 auth cliauth
-	local operatorname operatorid registration accesstech signalquality
-	local allowedmode preferredmode
-
-	local device apn allowedauth username password pincode
-	local iptype plmn metric signalrate allow_roaming
-
-	local address prefix gateway mtu dns1 dns2
-
-	json_get_vars device apn allowedauth username password
-	json_get_vars pincode iptype plmn metric signalrate allow_roaming
-	json_get_vars allowedmode preferredmode
-
-	# validate sysfs path given in config
-	[ -n "${device}" ] || {
-		echo "No device specified"
-		proto_notify_error "${interface}" NO_DEVICE
-		proto_set_available "${interface}" 0
-		return 1
-	}
-
-	# validate that ModemManager is handling the modem at the sysfs path
-	modemstatus=$(mmcli --modem="${device}" --output-keyvalue)
-	modempath=$(modemmanager_get_field "${modemstatus}" "modem.dbus-path")
-	[ -n "${modempath}" ] || {
-		echo "Device not managed by ModemManager"
-		proto_notify_error "${interface}" DEVICE_NOT_MANAGED
-		proto_set_available "${interface}" 0
-		return 1
-	}
-	echo "modem available at ${modempath}"
-
-	[ -z "${allowedmode}" ] || {
-		case "$allowedmode" in
-			"2g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "2g"
-				;;
-			"3g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "3g"
-				;;
-			"4g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "4g"
-				;;
-			"5g")
-				modemmanager_set_allowed_mode "$device" \
-					"$interface" "5g"
-				;;
-			*)
-				modemmanager_set_preferred_mode "$device" \
-					"$interface" "${allowedmode}" "${preferredmode}"
-				;;
-		esac
-		# check error for allowed_mode and preferred_mode function call
-		[ "$?" -ne "0" ] && return 1
-	}
-
-	# always cleanup before attempting a new connection, just in case
-	modemmanager_cleanup_connection "${modemstatus}"
-
-	# if allowedauth list given, build option string
-	for auth in $allowedauth; do
-		cliauth="${cliauth}${cliauth:+|}$auth"
-	done
-
-	# setup connect args; APN mandatory (even if it may be empty)
-	echo "starting connection with apn '${apn}'..."
-	proto_notify_error "${interface}" MM_CONNECT_IN_PROGRESS
-
-	# setup allow-roaming parameter
-	if [ -n "${allow_roaming}" ] && [ "${allow_roaming}" -eq 0 ];then
-		allow_roaming="no"
-	else
-		# allowed unless a user set the opposite
-		allow_roaming="yes"
-	fi
-
-	# Append options to 'connectargs' variable
-	append_param "apn=${apn}"
-	append_param "allow-roaming=${allow_roaming}"
-	append_param "${iptype:+ip-type=${iptype}}"
-	append_param "${plmn:+operator-id=${plmn}}"
-	append_param "${cliauth:+allowed-auth=${cliauth}}"
-	append_param "${username:+user=${username}}"
-	append_param "${password:+password=${password}}"
-	append_param "${pincode:+pin=${pincode}}"
-
-	mmcli --modem="${device}" --timeout 120 --simple-connect="${connectargs}" || {
-		proto_notify_error "${interface}" MM_CONNECT_FAILED
-		proto_block_restart "${interface}"
-		return 1
-	}
-
-	# check if Signal refresh rate is set
-	if [ -n "${signalrate}" ] && [ "${signalrate}" -eq "${signalrate}" ] 2>/dev/null; then
-		echo "setting signal refresh rate to ${signalrate} seconds"
-		mmcli --modem="${device}" --signal-setup="${signalrate}"
-	else
-		echo "signal refresh rate is not set"
-	fi
-
-	# log additional useful information
-	modemstatus=$(mmcli --modem="${device}" --output-keyvalue)
-	operatorname=$(modemmanager_get_field "${modemstatus}" "modem.3gpp.operator-name")
-	[ -n "${operatorname}" ] && echo "network operator name: ${operatorname}"
-	operatorid=$(modemmanager_get_field "${modemstatus}" "modem.3gpp.operator-code")
-	[ -n "${operatorid}" ] && echo "network operator MCCMNC: ${operatorid}"
-	registration=$(modemmanager_get_field "${modemstatus}" "modem.3gpp.registration-state")
-	[ -n "${registration}" ] && echo "registration type: ${registration}"
-	accesstech=$(modemmanager_get_multivalue_field "${modemstatus}" "modem.generic.access-technologies")
-	[ -n "${accesstech}" ] && echo "access technology: ${accesstech}"
-	signalquality=$(modemmanager_get_field "${modemstatus}" "modem.generic.signal-quality.value")
-	[ -n "${signalquality}" ] && echo "signal quality: ${signalquality}%"
-
-	# we won't like it if there are more than one bearers, as that would mean the
-	# user manually created them, and that's unsupported by this proto
-	bearercount=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.length")
-	[ -n "${bearercount}" ] && [ "$bearercount" -eq 1 ] || {
-		proto_notify_error "${interface}" INVALID_BEARER_LIST
-		return 1
-	}
-
-	# load connected bearer information
-	bearerpath=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.value\[1\]")
-	bearerstatus=$(mmcli --bearer "${bearerpath}" --output-keyvalue)
-
-	# load network interface and method information
-	beareriface=$(modemmanager_get_field "${bearerstatus}" "bearer.status.interface")
-	bearermethod_ipv4=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.method")
-	bearermethod_ipv6=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.method")
-
-	# setup IPv4
-	[ -n "${bearermethod_ipv4}" ] && {
-		echo "IPv4 connection setup required in interface ${interface}: ${bearermethod_ipv4}"
-		case "${bearermethod_ipv4}" in
-		"dhcp")
-			modemmanager_connected_method_dhcp_ipv4 "${interface}" "${beareriface}" "${metric}"
-			;;
-		"static")
-			address=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.address")
-			prefix=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.prefix")
-			gateway=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.gateway")
-			mtu=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.mtu")
-			dns1=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.dns.value\[1\]")
-			dns2=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.dns.value\[2\]")
-			modemmanager_connected_method_static_ipv4 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}"
-			;;
-		"ppp")
-			modemmanager_connected_method_ppp_ipv4 "${interface}" "${beareriface}" "${username}" "${password}" "${allowedauth}"
-			;;
-		*)
-			proto_notify_error "${interface}" UNKNOWN_METHOD
-			return 1
-			;;
-		esac
-	}
-
-	# setup IPv6
-	# note: if using ipv4v6, both IPv4 and IPv6 settings will have the same MTU and metric values reported
-	[ -n "${bearermethod_ipv6}" ] && {
-		echo "IPv6 connection setup required in interface ${interface}: ${bearermethod_ipv6}"
-		case "${bearermethod_ipv6}" in
-		"dhcp")
-			modemmanager_connected_method_dhcp_ipv6 "${interface}" "${beareriface}" "${metric}"
-			;;
-		"static")
-			address=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.address")
-			prefix=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.prefix")
-			gateway=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.gateway")
-			mtu=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.mtu")
-			dns1=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.dns.value\[1\]")
-			dns2=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.dns.value\[2\]")
-			modemmanager_connected_method_static_ipv6 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}"
-			;;
-		"ppp")
-			proto_notify_error "${interface}" "unsupported method"
-			return 1
-			;;
-		*)
-			proto_notify_error "${interface}" UNKNOWN_METHOD
-			return 1
-			;;
-		esac
-	}
-
-	return 0
-}
-
-proto_modemmanager_teardown() {
-	local interface="$1"
-
-	local modemstatus bearerpath errorstring
-	local bearermethod_ipv4 bearermethod_ipv6
-
-	local device lowpower iptype
-	json_get_vars device lowpower iptype
-
-	echo "stopping network"
-
-	# load connected bearer information, just the first one should be ok
-	modemstatus=$(mmcli --modem="${device}" --output-keyvalue)
-	bearerpath=$(modemmanager_get_field "${modemstatus}" "modem.generic.bearers.value\[1\]")
-	[ -n "${bearerpath}" ] || {
-		echo "couldn't load bearer path: disconnecting anyway"
-		mmcli --modem="${device}" --simple-disconnect >/dev/null 2>&1
-		return
-	}
-
-	# load bearer connection methods
-	bearerstatus=$(mmcli --bearer "${bearerpath}" --output-keyvalue)
-	bearermethod_ipv4=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.method")
-	[ -n "${bearermethod_ipv4}" ] &&
-		echo "IPv4 connection teardown required in interface ${interface}: ${bearermethod_ipv4}"
-	bearermethod_ipv6=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.method")
-	[ -n "${bearermethod_ipv6}" ] &&
-		echo "IPv6 connection teardown required in interface ${interface}: ${bearermethod_ipv6}"
-
-	# disconnection handling only requires special treatment in IPv4/PPP
-	[ "${bearermethod_ipv4}" = "ppp" ] && modemmanager_disconnected_method_ppp_ipv4 "${interface}"
-
-	# disconnect
-	mmcli --modem="${device}" --simple-disconnect ||
-		proto_notify_error "${interface}" DISCONNECT_FAILED
-
-	# disable
-	mmcli --modem="${device}" --disable
-
-	# low power, only if requested
-	[ "${lowpower:-0}" -lt 1 ] ||
-		mmcli --modem="${device}" --set-power-state-low
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol modemmanager
-}
diff --git a/modemmanager/files/usr/sbin/ModemManager-wrapper b/modemmanager/files/usr/sbin/ModemManager-wrapper
deleted file mode 100644
index 97c2a826d..000000000
--- a/modemmanager/files/usr/sbin/ModemManager-wrapper
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-trap_with_arg() {
-	func="$1" ; shift
-	for sig ; do
-		# shellcheck disable=SC2064
-		trap "$func $sig" "$sig"
-	done
-}
-
-func_trap() {
-	logger "ModemManager-wrapper[$$]" "Sending signal ${1}..."
-	kill "-${1}" "$CHILD" 2>/dev/null
-}
-
-main() {
-	. /usr/share/ModemManager/modemmanager.common
-
-	trap_with_arg func_trap INT TERM KILL
-
-	mkdir -p "${MODEMMANAGER_RUNDIR}"
-	chmod 0755 "${MODEMMANAGER_RUNDIR}"
-
-	/usr/sbin/ModemManager "$@" 1>/dev/null 2>/dev/null &
-	CHILD="$!"
-
-	mm_report_events_from_cache
-
-	wait "$CHILD"
-
-	# Set all configured interfaces as unavailable
-	mm_cleanup_interfaces
-}
-
-main "$@"