diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
index 42ed7d1b9..351cac58b 100755
--- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
@@ -20,7 +20,7 @@ omr_intf_set() {
 	local ifname
 	config_get ifname "$1" device
 	[ -z "$ifname" ] && config_get ifname "$1" ifname
-	config_get device "$1" device
+	config_get devicename "$1" _modem_device
 	config_get type "$1" type
 
 	[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
@@ -39,7 +39,7 @@ omr_intf_set() {
 			uci -q delete network.$1.modalias
 			uci -q delete network.$1.product
 		fi
-	elif [ "$type" != "macvlan" ] &&  [ -n "$device" ] && [ -f /sys/bus/usb-serial/devices/${devicename}/device/uevent ] && [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PRODUCT)" != "" ]; then
+	elif [ "$type" != "macvlan" ] &&  [ -n "$devicename" ] && [ -f /sys/bus/usb-serial/devices/${devicename}/device/uevent ] && [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PRODUCT)" != "" ]; then
 		mac=""
 		if [ -f /sys/class/net/${ifname}/address ]; then
 			mac="$(cat /sys/class/net/${ifname}/address | tr -d '\n')"
diff --git a/luci-proto-modemmanager/Makefile b/luci-proto-modemmanager/Makefile
deleted file mode 100755
index 8d968ff7e..000000000
--- a/luci-proto-modemmanager/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=Support for ModemManager
-LUCI_DEPENDS:=+modemmanager
-PKG_VERSION:=omr-202103
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js b/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
deleted file mode 100755
index 33cf6dce4..000000000
--- a/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
+++ /dev/null
@@ -1,121 +0,0 @@
-'use strict';
-'require fs';
-'require form';
-'require network';
-
-function getModemList() {
-	return fs.exec_direct('/usr/bin/mmcli', [ '-L' ]).then(function(res) {
-		var lines = (res || '').split(/\n/),
-		    tasks = [];
-
-		for (var i = 0; i < lines.length; i++) {
-			var m = lines[i].match(/\/Modem\/(\d+)/);
-			if (m)
-				tasks.push(fs.exec_direct('/usr/bin/mmcli', [ '-m', m[1] ]));
-		}
-
-		return Promise.all(tasks).then(function(res) {
-			var modems = [];
-
-			for (var i = 0; i < res.length; i++) {
-				var man = res[i].match(/manufacturer: ([^\n]+)/),
-				    mod = res[i].match(/model: ([^\n]+)/),
-				    dev = res[i].match(/device: ([^\n]+)/);
-
-				if (dev) {
-					modems.push({
-						device:       dev[1].trim(),
-						manufacturer: (man ? man[1].trim() : '') || '?',
-						model:        (mod ? mod[1].trim() : '') || dev[1].trim()
-					});
-				}
-			}
-
-			return modems;
-		});
-	});
-}
-
-network.registerPatternVirtual(/^mobiledata-.+$/);
-network.registerErrorCode('CALL_FAILED', _('Call failed'));
-network.registerErrorCode('NO_CID',      _('Unable to obtain client ID'));
-network.registerErrorCode('PLMN_FAILED', _('Setting PLMN failed'));
-
-return network.registerProtocol('modemmanager', {
-	getI18n: function() {
-		return _('ModemManager');
-	},
-
-	getIfname: function() {
-		return this._ubus('l3_device') || 'modemmanager-%s'.format(this.sid);
-	},
-
-	getOpkgPackage: function() {
-		return 'modemmanager';
-	},
-
-	isFloating: function() {
-		return true;
-	},
-
-	isVirtual: function() {
-		return true;
-	},
-
-	getDevices: function() {
-		return null;
-	},
-
-	containsDevice: function(ifname) {
-		return (network.getIfnameOf(ifname) == this.getIfname());
-	},
-
-	renderFormOptions: function(s) {
-		var dev = this.getL3Device() || this.getDevice(), o;
-
-		o = s.taboption('general', form.ListValue, 'device', _('Modem device'));
-		o.rmempty = false;
-		o.load = function(section_id) {
-			return getModemList().then(L.bind(function(devices) {
-				for (var i = 0; i < devices.length; i++)
-					this.value(devices[i].device,
-						'%s - %s (%s)'.format(devices[i].manufacturer, devices[i].model, devices[i].device));
-				return form.Value.prototype.load.apply(this, [section_id]);
-			}, this));
-		};
-
-		s.taboption('general', form.Value, 'apn', _('APN'));
-		s.taboption('general', form.Value, 'pincode', _('PIN'));
-
-		o = s.taboption('general', form.ListValue, 'auth', _('Authentication Type'));
-		o.value('both', _('PAP/CHAP (both)'));
-		o.value('pap', 'PAP');
-		o.value('chap', 'CHAP');
-		o.value('none', _('None'));
-		o.default = 'none';
-
-		o = s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
-		o.depends('auth', 'pap');
-		o.depends('auth', 'chap');
-		o.depends('auth', 'both');
-
-		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
-		o.depends('auth', 'pap');
-		o.depends('auth', 'chap');
-		o.depends('auth', 'both');
-		o.password = true;
-
-		o = s.taboption('general', form.ListValue, 'iptype', _('IP Type'));
-		o.value('ipv4v6', _('IPv4/IPv6 (both - defaults to IPv4)'))
-		o.value('ipv4', _('IPv4 only'));
-		o.value('ipv6', _('IPv6 only'));
-		o.default = 'ipv4v6';
-
-		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
-		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
-		o.datatype    = 'max(9200)';
-		
-		s.taboption('general', form.Value, 'metric', _('Gateway metric'));
-
-	}
-});
diff --git a/luci-proto-modemmanager/root/usr/share/rpcd/acl.d/luci-proto-modemmanager.json b/luci-proto-modemmanager/root/usr/share/rpcd/acl.d/luci-proto-modemmanager.json
deleted file mode 100755
index 716f4c465..000000000
--- a/luci-proto-modemmanager/root/usr/share/rpcd/acl.d/luci-proto-modemmanager.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"luci-proto-modemmanager": {
-		"description": "Grant access to mmcli",
-		"read": {
-			"cgi-io": [ "exec" ],
-			"file": {
-				"/usr/bin/mmcli -L": [ "exec" ],
-				"/usr/bin/mmcli -m [0-9]": [ "exec" ]
-			}
-		}
-	}
-}