[ofono] Access control for SIM Toolkit agent. Fixes JB#49163

Non-privileged process will get org.ofono.Error.AccessDenied from RegisterAgent. Other methods already check that D-Bus call is coming from a registered agent.
2025-11-25 20:01:05 +08:00 · 2020-03-03 23:42:28 +02:00
78 changed files with 1231 additions and 4152 deletions
--- a/ofono/.gitignore
+++ b/ofono/.gitignore
@@ -45,7 +45,6 @@ unit/test-caif
 unit/test-stkutil
 unit/test-cdmasms
 unit/test-dbus-access
-unit/test-dbus-clients
 unit/test-dbus-queue
 unit/test-gprs-filter
 unit/test-ril_config
--- a/ofono/Makefile.am
+++ b/ofono/Makefile.am
@@ -26,7 +26,7 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/sms-filter.h include/gprs-filter.h \
 			include/voicecall-filter.h include/dbus-access.h \
 			include/ril-constants.h include/ril-transport.h \
-			include/watch.h gdbus/gdbus.h include/dbus-clients.h \
+			include/watch.h gdbus/gdbus.h \
 			include/netmon.h include/lte.h include/ims.h \
 			include/storage.h

@@ -151,10 +151,8 @@ builtin_sources +=	drivers/ril/ril_call_barring.c \
 			drivers/ril/ril_devinfo.c \
 			drivers/ril/ril_devmon.c \
 			drivers/ril/ril_devmon_auto.c \
-			drivers/ril/ril_devmon_combine.c \
 			drivers/ril/ril_devmon_ds.c \
 			drivers/ril/ril_devmon_ss.c \
-			drivers/ril/ril_devmon_ur.c \
 			drivers/ril/ril_ecclist.c \
 			drivers/ril/ril_gprs.c \
 			drivers/ril/ril_gprs_context.c \
@@ -775,8 +773,7 @@ src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
 			src/handsfree-audio.c src/bluetooth.h \
 			src/sim-mnclength.c src/voicecallagent.c \
 			src/sms-filter.c src/gprs-filter.c \
-			src/dbus-clients.c src/dbus-queue.c \
-			src/dbus-access.c src/config.c \
+			src/dbus-queue.c src/dbus-access.c src/config.c \
 			src/voicecall-filter.c src/ril-transport.c \
 			src/hfp.h src/siri.c src/watchlist.c \
 			src/netmon.c src/lte.c src/ims.c \
@@ -982,7 +979,7 @@ unit_test_sailfish_cell_info_dbus_SOURCES = unit/test-dbus.c \
 			unit/fake_sailfish_cell_info.c \
 			plugins/sailfish_manager/sailfish_cell_info.c \
 			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
-			gdbus/object.c src/dbus-clients.c \
+			gdbus/object.c \
 			src/dbus.c src/log.c
 unit_test_sailfish_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
 			@DBUS_GLIB_CFLAGS@
@@ -1165,14 +1162,6 @@ unit_test_caif_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)

-unit_test_dbus_clients_SOURCES = unit/test-dbus-clients.c unit/test-dbus.c \
-				src/dbus-clients.c gdbus/object.c \
-				src/dbus.c src/log.c
-unit_test_dbus_clients_CFLAGS =  @DBUS_GLIB_CFLAGS@ $(COVERAGE_OPT) $(AM_CFLAGS)
-unit_test_dbus_clients_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_dbus_clients_OBJECTS)
-unit_tests += unit/test-dbus-clients
-
 unit_test_dbus_queue_SOURCES = unit/test-dbus-queue.c unit/test-dbus.c \
 				src/dbus-queue.c gdbus/object.c \
 				src/dbus.c src/log.c
--- a/ofono/configure.ac
+++ b/ofono/configure.ac
@@ -189,8 +189,8 @@ CFLAGS="$CFLAGS $GLIBUTIL_CFLAGS"
 LIBS="$LIBS $GLIBUTIL_LIBS"

 if (test "${enable_sailfish_rilmodem}" = "yes"); then
-	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.38, dummy=yes,
-				AC_MSG_ERROR(libgrilio >= 1.0.38 is required))
+	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.35, dummy=yes,
+				AC_MSG_ERROR(libgrilio >= 1.0.35 is required))
 	PKG_CHECK_MODULES(LIBMCE, libmce-glib >= 1.0.6, dummy=yes,
 				AC_MSG_ERROR(libmce-glib >= 1.0.6 is required))
 	CFLAGS="$CFLAGS $GRILIO_CFLAGS $LIBMCE_CFLAGS"
--- a/ofono/doc/connman-api.txt
+++ b/ofono/doc/connman-api.txt
@@ -278,13 +278,6 @@ Properties	boolean Active [readwrite]
 				via this proxy.  All other values are left
 				out in this case.

-			array{string} ProxyCSCF [readonly, optional]
-
-				Holds the list of P-CSCF (SIP proxy) for this
-				context. Only used by IMS connections.
-
-				This is a Sailfish OS specific extension.
-
 		dict IPv6.Settings [readonly, optional]

 			Holds all the IPv6 network settings
@@ -311,13 +304,6 @@ Properties	boolean Active [readwrite]

 				Holds the gateway IP for this connection.

-			array{string} ProxyCSCF [readonly, optional]
-
-				Holds the list of P-CSCF (SIP proxy) for this
-				context. Only used by IMS connections.
-
-				This is a Sailfish OS specific extension.
-
 		string MessageProxy [readwrite, MMS only]

 			Holds the MMS Proxy setting.
--- a/ofono/drivers/ril/ril_cbs.c
+++ b/ofono/drivers/ril/ril_cbs.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -24,7 +24,6 @@ struct ril_cbs {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
 	char *log_prefix;
-	guint register_id;
 	gulong event_id;
 };

@@ -52,12 +51,6 @@ static struct ril_cbs_cbd *ril_cbs_cbd_new(struct ril_cbs *cd,
 	return cbd;
 }

-static gboolean ril_cbs_retry(GRilIoRequest *request, int ril_status,
-               const void *resp_data, guint resp_len, void *user_data)
-{
-       return ril_status == RIL_E_INVALID_STATE;
-}
-
 static void ril_cbs_request_activation(struct ril_cbs *cd,
 		gboolean activate, GRilIoChannelResponseFunc response,
 		GDestroyNotify destroy, void* user_data)
@@ -68,9 +61,6 @@ static void ril_cbs_request_activation(struct ril_cbs *cd,
 	grilio_request_append_int32(req, activate ? 0 :1);

 	DBG_(cd, "%sactivating CB", activate ? "" : "de");
-	grilio_request_set_retry_func(req, ril_cbs_retry);
-	grilio_request_set_retry(req, RIL_CBS_CHECK_RETRY_MS,
-				RIL_CBS_CHECK_RETRY_COUNT);
 	grilio_queue_send_request_full(cd->q, req,
 				RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION,
 				response, destroy, user_data);
@@ -107,9 +97,6 @@ static void ril_cbs_set_config(struct ril_cbs *cd, const char *topics,
 	}

 	DBG_(cd, "configuring CB");
-	grilio_request_set_retry_func(req, ril_cbs_retry);
-	grilio_request_set_retry(req, RIL_CBS_CHECK_RETRY_MS,
-			RIL_CBS_CHECK_RETRY_COUNT);
 	grilio_queue_send_request_full(cd->q, req,
 			RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG,
 			response, destroy, user_data);
@@ -157,41 +144,27 @@ static void ril_cbs_notify(GRilIoChannel *io, guint code,
 				const void *data, guint len, void *user_data)
 {
 	struct ril_cbs *cd = user_data;
-	GRilIoParser rilp;
-	guint32 pdu_len;

 	GASSERT(code == RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS);
-	grilio_parser_init(&rilp, data, len);
-	if (grilio_parser_get_uint32(&rilp, &pdu_len)) {
-		const void* pdu = grilio_parser_get_bytes(&rilp, pdu_len);
-
-		/*
-		 * By default assume that it's a length followed by the
-		 * binary PDU data.
-		 */
-		if (pdu && grilio_parser_bytes_remaining(&rilp) < 4) {
-			DBG_(cd, "%u bytes", pdu_len);
-			ofono_cbs_notify(cd->cbs, pdu, pdu_len);
-		} else {
-			/*
-			 * But I've seen cell broadcasts arriving without
-			 * the length, simply as a blob.
-			 */
-			ofono_cbs_notify(cd->cbs, data, len);
-		}
-	}
+	DBG_(cd, "%u bytes", len);
+	ofono_cbs_notify(cd->cbs, data, len);
 }

-static gboolean ril_cbs_register(void *user_data)
+static void ril_cbs_probe_done_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
 {
 	struct ril_cbs *cd = user_data;

-	DBG_(cd, "registering for CB");
-	cd->register_id = 0;
-	cd->event_id = grilio_channel_add_unsol_event_handler(cd->io,
-		ril_cbs_notify, RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS, cd);
-	ofono_cbs_register(cd->cbs);
-	return G_SOURCE_REMOVE;
+	if (status == RIL_E_SUCCESS) {
+		DBG_(cd, "registering for CB");
+		cd->event_id = grilio_channel_add_unsol_event_handler(cd->io,
+			ril_cbs_notify, RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS,
+									cd);
+		ofono_cbs_register(cd->cbs);
+	} else {
+		DBG_(cd, "failed to query CB config");
+		ofono_cbs_remove(cd->cbs);
+	}
 }

 static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
@@ -199,6 +172,7 @@ static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
 {
 	struct ril_modem *modem = data;
 	struct ril_cbs *cd = g_try_new0(struct ril_cbs, 1);
+	GRilIoRequest* req = grilio_request_new();

 	ofono_cbs_set_data(cbs, cd);
 	cd->log_prefix = (modem->log_prefix && modem->log_prefix[0]) ?
@@ -208,7 +182,20 @@ static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
 	DBG_(cd, "");
 	cd->io = grilio_channel_ref(ril_modem_io(modem));
 	cd->q = grilio_queue_new(cd->io);
-	cd->register_id = g_idle_add(ril_cbs_register, cd);
+
+	/*
+	 * RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG often fails at startup
+	 * especially if other RIL requests are running in parallel. We may
+	 * have to retry a few times. Also, make it blocking in order to
+	 * improve the chance of success.
+	 */
+	grilio_request_set_retry(req, RIL_CBS_CHECK_RETRY_MS,
+						RIL_CBS_CHECK_RETRY_COUNT);
+	grilio_request_set_blocking(req, TRUE);
+	grilio_queue_send_request_full(cd->q, req,
+				RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG,
+				ril_cbs_probe_done_cb, NULL, cd);
+	grilio_request_unref(req);
 	return 0;
 }

@@ -217,9 +204,6 @@ static void ril_cbs_remove(struct ofono_cbs *cbs)
 	struct ril_cbs *cd = ofono_cbs_get_data(cbs);

 	DBG_(cd, "");
-	if (cd->register_id) {
-		g_source_remove(cd->register_id);
-	}
 	ofono_cbs_set_data(cbs, NULL);
 	grilio_channel_remove_handler(cd->io, cd->event_id);
 	grilio_channel_unref(cd->io);
--- a/ofono/drivers/ril/ril_cell_info.c
+++ b/ofono/drivers/ril/ril_cell_info.c
@@ -1,8 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2016-2019 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -47,7 +46,6 @@ struct ril_cell_info {
 	gulong event_id;
 	guint query_id;
 	guint set_rate_id;
-	gboolean enabled;
 };

 enum ril_cell_info_signal {
@@ -332,8 +330,7 @@ static void ril_cell_info_list_cb(GRilIoChannel *io, int status,
 	DBG_(self, "");
 	GASSERT(self->query_id);
 	self->query_id = 0;
-	ril_cell_info_update_cells(self,
-		(status == RIL_E_SUCCESS && self->enabled) ?
+	ril_cell_info_update_cells(self, (status == RIL_E_SUCCESS) ?
 		ril_cell_info_parse_list(io->ril_version, data, len) : NULL);
 }

@@ -347,26 +344,11 @@ static void ril_cell_info_set_rate_cb(GRilIoChannel *io, int status,
 	self->set_rate_id = 0;
 }

-static gboolean ril_cell_info_retry(GRilIoRequest* request, int ril_status,
-		const void* response_data, guint response_len, void* user_data)
-{
-	struct ril_cell_info *self = RIL_CELL_INFO(user_data);
-
-	switch (ril_status) {
-	case RIL_E_SUCCESS:
-	case RIL_E_RADIO_NOT_AVAILABLE:
-		return FALSE;
-	default:
-		return self->enabled;
-	}
-}
-
 static void ril_cell_info_query(struct ril_cell_info *self)
 {
 	GRilIoRequest *req = grilio_request_new();

 	grilio_request_set_retry(req, RIL_RETRY_MS, MAX_RETRIES);
-	grilio_request_set_retry_func(req, ril_cell_info_retry);
 	grilio_channel_cancel_request(self->io, self->query_id, FALSE);
 	self->query_id = grilio_channel_send_request_full(self->io, req,
 		RIL_REQUEST_GET_CELL_INFO_LIST, ril_cell_info_list_cb,
@@ -377,11 +359,9 @@ static void ril_cell_info_query(struct ril_cell_info *self)
 static void ril_cell_info_set_rate(struct ril_cell_info *self)
 {
 	GRilIoRequest *req = grilio_request_array_int32_new(1,
-		(self->update_rate_ms >= 0 && self->enabled) ?
-		self->update_rate_ms : INT_MAX);
+		(self->update_rate_ms > 0) ? self->update_rate_ms : INT_MAX);

 	grilio_request_set_retry(req, RIL_RETRY_MS, MAX_RETRIES);
-	grilio_request_set_retry_func(req, ril_cell_info_retry);
 	grilio_channel_cancel_request(self->io, self->set_rate_id, FALSE);
 	self->set_rate_id = grilio_channel_send_request_full(self->io, req,
 			RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE,
@@ -392,8 +372,7 @@ static void ril_cell_info_set_rate(struct ril_cell_info *self)
 static void ril_cell_info_refresh(struct ril_cell_info *self)
 {
 	/* RIL_REQUEST_GET_CELL_INFO_LIST fails without SIM card */
-	if (self->enabled && self->radio->state == RADIO_STATE_ON &&
-						self->sim_card_ready) {
+	if (self->radio->state == RADIO_STATE_ON && self->sim_card_ready) {
 		ril_cell_info_query(self);
 	} else {
 		ril_cell_info_update_cells(self, NULL);
@@ -488,21 +467,6 @@ static void ril_cell_info_set_update_interval_proc
 	if (self->update_rate_ms != ms) {
 		self->update_rate_ms = ms;
 		DBG_(self, "%d ms", ms);
-		if (self->enabled && self->sim_card_ready) {
-			ril_cell_info_set_rate(self);
-		}
-	}
-}
-
-void ril_cell_info_set_enabled_proc(struct sailfish_cell_info *info,
-							gboolean enabled)
-{
-	struct ril_cell_info *self = ril_cell_info_cast(info);
-
-	if (self->enabled != enabled) {
-		self->enabled = enabled;
-		DBG_(self, "%d", enabled);
-		ril_cell_info_refresh(self);
 		if (self->sim_card_ready) {
 			ril_cell_info_set_rate(self);
 		}
@@ -518,8 +482,7 @@ struct sailfish_cell_info *ril_cell_info_new(GRilIoChannel *io,
 		ril_cell_info_unref_proc,
 		ril_cell_info_add_cells_changed_handler_proc,
 		ril_cell_info_remove_handler_proc,
-		ril_cell_info_set_update_interval_proc,
-		ril_cell_info_set_enabled_proc
+		ril_cell_info_set_update_interval_proc
 	};

 	struct ril_cell_info *self = g_object_new(RIL_CELL_INFO_TYPE, 0);
@@ -541,9 +504,6 @@ struct sailfish_cell_info *ril_cell_info_new(GRilIoChannel *io,
 			ril_cell_info_sim_status_cb, self);
 	self->sim_card_ready = ril_sim_card_ready(sim_card);
 	ril_cell_info_refresh(self);
-
-	/* Disable updates by default */
-	self->enabled = FALSE;
 	if (self->sim_card_ready) {
 		ril_cell_info_set_rate(self);
 	}
--- a/ofono/drivers/ril/ril_config.c
+++ b/ofono/drivers/ril/ril_config.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -186,72 +186,6 @@ gboolean ril_config_get_enum(GKeyFile *file, const char *group,
 	return FALSE;
 }

-gboolean ril_config_get_mask(GKeyFile *file, const char *group,
-					const char *key, int *result,
-					const char *name, int value, ...)
-{
-	char *str = ril_config_get_string(file, group, key);
-	gboolean ok = FALSE;
-	
-	if (result) {
-		*result = 0;
-	}
-
-	if (str) {
-		/*
-		 * Some people are thinking that # is a comment
-		 * anywhere on the line, not just at the beginning
-		 */
-		char *comment = strchr(str, '#');
-		char **values, **ptr;
-
-		if (comment) *comment = 0;
-		values = g_strsplit(str, "+", -1);
-
-		for (ok = TRUE, ptr = values; *ptr && ok; ptr++) {
-			const char* found_str = NULL;
-			const char* s = g_strstrip(*ptr);
-
-			if (!strcasecmp(s, name)) {
-				found_str = name;
-				if (result) {
-					*result |= value;
-				}
-			} else {
-				va_list args;
-				const char* known;
-
-				va_start(args, value);
-				while ((known = va_arg(args, char*)) != NULL) {
-					const int bit = va_arg(args, int);
-
-					if (!strcasecmp(s, known)) {
-						found_str = known;
-						if (result) {
-							*result |= bit;
-						}
-						break;
-					}
-				}
-				va_end(args);
-			}
-
-			if (!found_str) {
-				ofono_error("Unknown bit '%s' in %s", s, key);
-				ok = FALSE;
-			}
-		}
-
-		g_strfreev(values);
-		g_free(str);
-	}
-
-	if (!ok && result) {
-		*result = 0;
-	}
-	return ok;
-}
-
 GUtilInts *ril_config_get_ints(GKeyFile *file, const char *group,
 					const char *key)
 {
--- a/ofono/drivers/ril/ril_config.h
+++ b/ofono/drivers/ril/ril_config.h
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -35,12 +35,7 @@ gboolean ril_config_get_flag(GKeyFile *file, const char *group,
 					const char *key, int flag, int *flags);
 gboolean ril_config_get_enum(GKeyFile *file, const char *group,
 					const char *key, int *result,
-					const char *name, int value, ...)
-					G_GNUC_NULL_TERMINATED;
-gboolean ril_config_get_mask(GKeyFile *file, const char *group,
-					const char *key, int *result,
-					const char *name, int value, ...)
-					G_GNUC_NULL_TERMINATED;
+					const char *name, int value, ...);
 GUtilInts *ril_config_get_ints(GKeyFile *file, const char *group,
 					const char *key);
 char *ril_config_ints_to_string(GUtilInts *ints, char separator);
--- a/ofono/drivers/ril/ril_constants.h
+++ b/ofono/drivers/ril/ril_constants.h
@@ -375,19 +375,6 @@ enum ril_restricted_state {
 #define RIL_FACILITY_UNLOCK "0"
 #define RIL_FACILITY_LOCK "1"

-/* See RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER (RIL_VERSION >= 15) */
-enum  ril_unsolicited_response_filter {
-	RIL_UR_SIGNAL_STRENGTH            = 0x01,
-	RIL_UR_FULL_NETWORK_STATE         = 0x02,
-	RIL_UR_DATA_CALL_DORMANCY_CHANGED = 0x04
-};
-
-/* RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE result */
-enum ril_network_selection_mode {
-	RIL_NETWORK_SELECTION_MODE_AUTO	  = 0,
-	RIL_NETWORK_SELECTION_MODE_MANUAL = 1
-};
-
 #endif /*__RIL_CONSTANTS_H */

 /*
--- a/ofono/drivers/ril/ril_data.c
+++ b/ofono/drivers/ril/ril_data.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2016-2020 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -81,7 +81,6 @@ typedef struct ril_data RilData;
 enum ril_data_io_event_id {
 	IO_EVENT_DATA_CALL_LIST_CHANGED,
 	IO_EVENT_RESTRICTED_STATE_CHANGED,
-	IO_EVENT_EOF,
 	IO_EVENT_COUNT
 };

@@ -193,7 +192,6 @@ struct ril_data_request_allow_data {

 static void ril_data_manager_check_network_mode(struct ril_data_manager *dm);
 static void ril_data_call_deact_cid(struct ril_data *data, int cid);
-static void ril_data_cancel_all_requests(struct ril_data *self);
 static void ril_data_power_update(struct ril_data *self);
 static void ril_data_signal_emit(struct ril_data *self, enum ril_data_signal id)
 {
@@ -243,7 +241,6 @@ struct ril_data_call *ril_data_call_dup(const struct ril_data_call *call)
 		dc->dnses = g_strdupv(call->dnses);
 		dc->gateways = g_strdupv(call->gateways);
 		dc->addresses = g_strdupv(call->addresses);
-		dc->pcscf = g_strdupv(call->pcscf);
 		return dc;
 	} else {
 		return NULL;
@@ -254,9 +251,8 @@ static void ril_data_call_destroy(struct ril_data_call *call)
 {
 	g_free(call->ifname);
 	g_strfreev(call->dnses);
-	g_strfreev(call->gateways);
 	g_strfreev(call->addresses);
-	g_strfreev(call->pcscf);
+	g_strfreev(call->gateways);
 }

 void ril_data_call_free(struct ril_data_call *call)
@@ -324,7 +320,8 @@ static gboolean ril_data_call_parse_default(struct ril_data_call *call,

 	/* RIL_Data_Call_Response_v9 */
 	if (version >= 9) {
-		call->pcscf = grilio_parser_split_utf8(rilp, " ");
+		/* PCSCF */
+		grilio_parser_skip_string(rilp);

 		/* RIL_Data_Call_Response_v11 */
 		if (version >= 11) {
@@ -355,19 +352,16 @@ static struct ril_data_call *ril_data_call_parse(struct ril_vendor *vendor,

 	if (parsed) {
 		DBG("[status=%d,retry=%d,cid=%d,active=%d,type=%s,ifname=%s,"
-			"mtu=%d,address=%s,dns=%s %s,gateways=%s,pcscf=%s %s]",
+			"mtu=%d,address=%s,dns=%s %s,gateways=%s]",
 			call->status, call->retry_time,
 			call->cid, call->active,
 			ril_protocol_from_ofono(call->prot),
 			call->ifname, call->mtu,
-			call->addresses ? call->addresses[0] : "",
-			call->dnses ? call->dnses[0] : "",
+			call->addresses ? call->addresses[0] : NULL,
+			call->dnses ? call->dnses[0] : NULL,
 			(call->dnses && call->dnses[0] &&
 			call->dnses[1]) ? call->dnses[1] : "",
-			call->gateways ? call->gateways[0] : "",
-			call->pcscf ? call->pcscf[0] : "",
-			(call->pcscf && call->pcscf[0] &&
-			call->pcscf[1]) ? call->pcscf[1] : "");
+			call->gateways ? call->gateways[0] : NULL);
 		return call;
 	} else {
 		ril_data_call_free(call);
@@ -433,8 +427,7 @@ static gboolean ril_data_call_equal(const struct ril_data_call *c1,
 			!g_strcmp0(c1->ifname, c2->ifname) &&
 			gutil_strv_equal(c1->dnses, c2->dnses) &&
 			gutil_strv_equal(c1->gateways, c2->gateways) &&
-			gutil_strv_equal(c1->addresses, c2->addresses) &&
-			gutil_strv_equal(c1->pcscf, c2->pcscf);
+			gutil_strv_equal(c1->addresses, c2->addresses);
 	} else {
 		return FALSE;
 	}
@@ -956,8 +949,7 @@ static gboolean ril_data_call_setup_submit(struct ril_data_request *req)
 	 *
 	 * Makes little sense but it is what it is.
 	 */
-	tech = (setup->profile_id == RIL_DATA_PROFILE_IMS) ?
-			RADIO_TECH_LTE : priv->network->data.ril_tech;
+	tech = priv->network->data.ril_tech;
 	if (tech > 2) {
 		tech += 2;
 	} else {
@@ -1020,22 +1012,10 @@ static struct ril_data_request *ril_data_call_setup_new(struct ril_data *data,
 		g_new0(struct ril_data_request_setup, 1);
 	struct ril_data_request *req = &setup->req;

-	setup->profile_id = RIL_DATA_PROFILE_DEFAULT;
-	if (priv->use_data_profiles) {
-		switch (context_type) {
-		case OFONO_GPRS_CONTEXT_TYPE_MMS:
-			setup->profile_id = priv->mms_data_profile_id;
-			break;
-		case OFONO_GPRS_CONTEXT_TYPE_IMS:
-			setup->profile_id = RIL_DATA_PROFILE_IMS;
-			break;
-		case OFONO_GPRS_CONTEXT_TYPE_ANY:
-		case OFONO_GPRS_CONTEXT_TYPE_INTERNET:
-		case OFONO_GPRS_CONTEXT_TYPE_WAP:
-			break;
-		}
-	}
-
+	setup->profile_id = (priv->use_data_profiles &&
+		context_type == OFONO_GPRS_CONTEXT_TYPE_MMS) ?
+			priv->mms_data_profile_id :
+			RIL_DATA_PROFILE_DEFAULT;
 	setup->apn = g_strdup(ctx->apn);
 	setup->username = g_strdup(ctx->username);
 	setup->password = g_strdup(ctx->password);
@@ -1214,31 +1194,6 @@ static struct ril_data_request *ril_data_allow_new(struct ril_data *data,
 	return req;
 }

-static gboolean ril_data_allow_can_submit(struct ril_data *self)
-{
-	if (self) {
-		switch (self->priv->options.allow_data) {
-		case RIL_ALLOW_DATA_ENABLED:
-			return TRUE;
-		case RIL_ALLOW_DATA_DISABLED:
-		case RIL_ALLOW_DATA_AUTO:
-			break;
-		}
-	}
-	return FALSE;
-}
-
-static gboolean ril_data_allow_submit_request(struct ril_data *data,
-							gboolean allow)
-{
-	if (ril_data_allow_can_submit(data)) {
-		ril_data_request_queue(ril_data_allow_new(data, allow));
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
 /*==========================================================================*
 * ril_data
 *==========================================================================*/
@@ -1269,39 +1224,12 @@ void ril_data_remove_handler(struct ril_data *self, gulong id)
 	}
 }

-static void ril_data_imsi_changed(struct ril_sim_settings *settings,
-							void *user_data)
-{
-	struct ril_data *self = RIL_DATA(user_data);
-	struct ril_data_priv *priv = self->priv;
-
-	if (!settings->imsi) {
-		/*
-		 * Most likely, SIM removal. In any case, no data requests
-		 * make sense when IMSI is unavailable.
-		 */
-		ril_data_cancel_all_requests(self);
-	}
-	ril_data_manager_check_network_mode(priv->dm);
-}
-
 static void ril_data_settings_changed(struct ril_sim_settings *settings,
 							void *user_data)
 {
 	ril_data_manager_check_network_mode(RIL_DATA(user_data)->priv->dm);
 }

-static void ril_data_ril_disconnected_cb(GRilIoChannel *io, void *user_data)
-{
-	struct ril_data *self = RIL_DATA(user_data);
-	struct ril_data_priv *priv = self->priv;
-
-	DBG_(self, "disconnected");
-	priv->flags = RIL_DATA_FLAG_NONE;
-	priv->restricted_state = 0;
-	ril_data_cancel_all_requests(self);
-}
-
 static gint ril_data_compare_cb(gconstpointer a, gconstpointer b)
 {
 	const struct ril_data *d1 = a;
@@ -1361,13 +1289,10 @@ struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
 			grilio_channel_add_unsol_event_handler(io,
 				ril_data_restricted_state_changed_cb,
 				RIL_UNSOL_RESTRICTED_STATE_CHANGED, self);
-		priv->io_event_id[IO_EVENT_EOF] =
-			grilio_channel_add_disconnected_handler(io,
-				ril_data_ril_disconnected_cb, self);

 		priv->settings_event_id[SETTINGS_EVENT_IMSI_CHANGED] =
 			ril_sim_settings_add_imsi_changed_handler(settings,
-					ril_data_imsi_changed, self);
+					ril_data_settings_changed, self);
 		priv->settings_event_id[SETTINGS_EVENT_PREF_MODE] =
 			ril_sim_settings_add_pref_mode_changed_handler(settings,
 					ril_data_settings_changed, self);
@@ -1490,20 +1415,6 @@ static void ril_data_cancel_requests(struct ril_data *self,
 	}
 }

-static void ril_data_cancel_all_requests(struct ril_data *self)
-{
-	struct ril_data_priv *priv = self->priv;
-	struct ril_data_request *req = priv->req_queue;
-
-	ril_data_request_do_cancel(priv->pending_req);
-	while (req) {
-		struct ril_data_request *next = req->next;
-
-		ril_data_request_do_cancel(req);
-		req = next;
-	}
-}
-
 static void ril_data_disallow(struct ril_data *self)
 {
 	struct ril_data_priv *priv = self->priv;
@@ -1525,8 +1436,10 @@ static void ril_data_disallow(struct ril_data *self)
 	 */
 	ril_data_deactivate_all(self);

-	/* Tell rild that the data is now disabled */
-	if (!ril_data_allow_submit_request(self, FALSE)) {
+	if (priv->options.allow_data == RIL_ALLOW_DATA_ENABLED) {
+		/* Tell rild that the data is now disabled */
+		ril_data_request_queue(ril_data_allow_new(self, FALSE));
+	} else {
 		priv->flags &= ~RIL_DATA_FLAG_ON;
 		GASSERT(!ril_data_allowed(self));
 		DBG_(self, "data off");
@@ -1673,11 +1586,24 @@ static void ril_data_dispose(GObject *object)
 	struct ril_data *self = RIL_DATA(object);
 	struct ril_data_priv *priv = self->priv;
 	struct ril_data_manager	*dm = priv->dm;
+	struct ril_network *network = priv->network;
+	struct ril_sim_settings *settings = network->settings;
+	struct ril_data_request *req;

+	ril_sim_settings_remove_handlers(settings, priv->settings_event_id,
+					G_N_ELEMENTS(priv->settings_event_id));
+	grilio_channel_remove_all_handlers(priv->io, priv->io_event_id);
 	grilio_queue_cancel_all(priv->q, FALSE);
 	priv->query_id = 0;

-	ril_data_cancel_all_requests(self);
+	ril_data_request_do_cancel(priv->pending_req);
+	req = priv->req_queue;
+	while (req) {
+		struct ril_data_request *next = req->next;
+		ril_data_request_do_cancel(req);
+		req = next;
+	}
+
 	dm->data_list = g_slist_remove(dm->data_list, self);
 	ril_data_manager_check_data(dm);
 	g_hash_table_destroy(priv->grab);
@@ -1688,11 +1614,6 @@ static void ril_data_finalize(GObject *object)
 {
 	struct ril_data *self = RIL_DATA(object);
 	struct ril_data_priv *priv = self->priv;
-	struct ril_network *network = priv->network;
-	struct ril_sim_settings *settings = network->settings;
-
-	ril_sim_settings_remove_all_handlers(settings, priv->settings_event_id);
-	grilio_channel_remove_all_handlers(priv->io, priv->io_event_id);

 	g_free(priv->log_prefix);
 	grilio_queue_unref(priv->q);
@@ -1778,39 +1699,34 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)

 	if ((self->flags & RIL_DATA_MANAGER_FORCE_GSM_ON_OTHER_SLOTS) &&
 		ril_data_manager_handover(self)) {
-		struct ril_network *lte_network = NULL, *best_network = NULL;
-		enum ofono_radio_access_mode best_mode =
-						OFONO_RADIO_ACCESS_MODE_ANY;
+		struct ril_network *lte_network = NULL;
+		int non_gsm_count = 0;

-		/* Find a SIM for internet access */
+		/*
+		 * Count number of SIMs for which non-GSM mode is selected
+		 */
 		for (l= self->data_list; l; l = l->next) {
 			struct ril_data *data = l->data;
 			struct ril_data_priv *priv = data->priv;
 			struct ril_network *network = priv->network;
 			struct ril_sim_settings *sim = network->settings;
-			enum ofono_radio_access_mode mode;

-			/* Select the first network with internet role */
-			if ((sim->pref_mode != OFONO_RADIO_ACCESS_MODE_GSM) &&
-				(priv->flags & RIL_DATA_FLAG_MAX_SPEED)) {
-				lte_network = network;
-				break;
-			}
-
-			/* At the same time, look for a suitable slot */
-			mode = ril_network_max_supported_mode(network);
-			if (mode > best_mode) {
-				best_network = network;
-				best_mode = mode;
+			if (sim->pref_mode != OFONO_RADIO_ACCESS_MODE_GSM) {
+				non_gsm_count++;
+				if ((priv->flags & RIL_DATA_FLAG_MAX_SPEED) &&
+							!lte_network) {
+					lte_network = network;
+				}
 			}
 		}

 		/*
 		 * If there's no SIM selected for internet access
-		 * then use a slot with highest capabilities for LTE.
+		 * then choose the first slot for LTE.
 		 */
 		if (!lte_network) {
-			lte_network = best_network;
+			struct ril_data *data = self->data_list->data;
+			lte_network = data->priv->network;
 		}

 		for (l= self->data_list; l; l = l->next) {
@@ -1836,14 +1752,12 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)

 static struct ril_data *ril_data_manager_allowed(struct ril_data_manager *self)
 {
-	if (self) {
-		GSList *l;
+	GSList *l;

-		for (l= self->data_list; l; l = l->next) {
-			struct ril_data *data = l->data;
-			if (data->priv->flags & RIL_DATA_FLAG_ALLOWED) {
-				return data;
-			}
+	for (l= self->data_list; l; l = l->next) {
+		struct ril_data *data = l->data;
+		if (data->priv->flags & RIL_DATA_FLAG_ALLOWED) {
+			return data;
 		}
 	}

@@ -1863,7 +1777,9 @@ static void ril_data_manager_switch_data_on(struct ril_data_manager *self,
 					ril_data_max_mode(data), TRUE);
 	}

-	if (!ril_data_allow_submit_request(data, TRUE)) {
+	if (priv->options.allow_data == RIL_ALLOW_DATA_ENABLED) {
+		ril_data_request_queue(ril_data_allow_new(data, TRUE));
+	} else {
 		priv->flags |= RIL_DATA_FLAG_ON;
 		GASSERT(ril_data_allowed(data));
 		DBG_(data, "data on");
@@ -1887,7 +1803,12 @@ void ril_data_manager_check_data(struct ril_data_manager *self)

 void ril_data_manager_assert_data_on(struct ril_data_manager *self)
 {
-	ril_data_allow_submit_request(ril_data_manager_allowed(self), TRUE);
+	if (self) {
+		struct ril_data *data = ril_data_manager_allowed(self);
+		if (data) {
+			ril_data_request_queue(ril_data_allow_new(data, TRUE));
+		}
+	}
 }

 /*
--- a/ofono/drivers/ril/ril_data.h
+++ b/ofono/drivers/ril/ril_data.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
+ *  Copyright (C) 2016-2019 Jolla Ltd.
 *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,6 @@ struct ril_data_call {
 	char **dnses;
 	char **gateways;
 	char **addresses;
-	char **pcscf;
 };

 struct ril_data_call_list {
@@ -80,6 +79,12 @@ struct ril_data_options {
 	unsigned int data_call_retry_delay_ms;
 };

+enum ril_data_role {
+	RIL_DATA_ROLE_NONE,    /* Data not allowed */
+	RIL_DATA_ROLE_MMS,     /* Data is allowed at any speed */
+	RIL_DATA_ROLE_INTERNET /* Data is allowed at full speed */
+};
+
 struct ril_data_manager;
 struct ril_data_manager *ril_data_manager_new(enum ril_data_manager_flags flg);
 struct ril_data_manager *ril_data_manager_ref(struct ril_data_manager *dm);
--- a/ofono/drivers/ril/ril_devmon.h
+++ b/ofono/drivers/ril/ril_devmon.h
@@ -1,8 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2020 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2019 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -34,34 +33,27 @@ struct ril_devmon {
 		GRilIoChannel *channel, struct sailfish_cell_info *cell_info);
 };

+/* Cell info update intervals */
+#define RIL_CELL_INFO_INTERVAL_SHORT_MS (2000) /* 2 sec */
+#define RIL_CELL_INFO_INTERVAL_LONG_MS (30000) /* 30 sec */
+
 /*
 * Legacy Device Monitor uses RIL_REQUEST_SCREEN_STATE to tell
 * the modem when screen turns on and off.
 */
-struct ril_devmon *ril_devmon_ss_new(const struct ril_slot_config *config);
+struct ril_devmon *ril_devmon_ss_new(void);

 /*
 * This Device Monitor uses RIL_REQUEST_SEND_DEVICE_STATE to let
 * the modem choose the right power saving strategy. It basically
 * mirrors the logic of Android's DeviceStateMonitor class.
 */
-struct ril_devmon *ril_devmon_ds_new(const struct ril_slot_config *config);
-
-/*
- * This Device Monitor implementation controls network state updates
- * by sending SET_UNSOLICITED_RESPONSE_FILTER.
- */
-struct ril_devmon *ril_devmon_ur_new(const struct ril_slot_config *config);
+struct ril_devmon *ril_devmon_ds_new(void);

 /*
 * This one selects the type based on the RIL version.
 */
-struct ril_devmon *ril_devmon_auto_new(const struct ril_slot_config *config);
-
-/*
- * This one combines several methods. Takes ownership of ril_devmon objects.
- */
-struct ril_devmon *ril_devmon_combine(struct ril_devmon *devmon[], guint n);
+struct ril_devmon *ril_devmon_auto_new(void);

 /* Utilities (NULL tolerant) */
 struct ril_devmon_io *ril_devmon_start_io(struct ril_devmon *devmon,
--- a/ofono/drivers/ril/ril_devmon_auto.c
+++ b/ofono/drivers/ril/ril_devmon_auto.c
@@ -65,7 +65,7 @@ static void ril_devmon_auto_free(struct ril_devmon *devmon)
 	g_free(self);
 }

-struct ril_devmon *ril_devmon_auto_new(const struct ril_slot_config *config)
+struct ril_devmon *ril_devmon_auto_new()
 {
 	DevMon *self = g_new0(DevMon, 1);

@@ -78,8 +78,8 @@ struct ril_devmon *ril_devmon_auto_new(const struct ril_slot_config *config)
 	 */
 	self->pub.free = ril_devmon_auto_free;
 	self->pub.start_io = ril_devmon_auto_start_io;
-	self->ss = ril_devmon_ss_new(config);
-	self->ds = ril_devmon_ds_new(config);
+	self->ss = ril_devmon_ss_new();
+	self->ds = ril_devmon_ds_new();
 	return &self->pub;
 }

--- a/ofono/drivers/ril/ril_devmon_combine.c
+++ b/ofono/drivers/ril/ril_devmon_combine.c
@@ -1,104 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2020 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-
-#include "ril_devmon.h"
-
-#include <ofono/log.h>
-
-typedef struct ril_devmon_combine {
-	struct ril_devmon pub;
-	struct ril_devmon **impl;
-	guint count;
-} DevMon;
-
-typedef struct ril_devmon_combine_io {
-	struct ril_devmon_io pub;
-	struct ril_devmon_io **impl;
-	guint count;
-} DevMonIo;
-
-static inline DevMon *ril_devmon_combine_cast(struct ril_devmon *dm)
-{
-	return G_CAST(dm, DevMon, pub);
-}
-
-static inline DevMonIo *ril_devmon_ds_io_cast(struct ril_devmon_io *io)
-{
-	return G_CAST(io, DevMonIo, pub);
-}
-
-static void ril_devmon_combine_io_free(struct ril_devmon_io *io)
-{
-	guint i;
-	DevMonIo *self = ril_devmon_ds_io_cast(io);
-
-	for (i = 0; i < self->count; i++) {
-		ril_devmon_io_free(self->impl[i]);
-	}
-	g_free(self);
-}
-
-static struct ril_devmon_io *ril_devmon_combine_start_io(struct ril_devmon *dm,
-			GRilIoChannel *chan, struct sailfish_cell_info *ci)
-{
-	guint i;
-	DevMon *self = ril_devmon_combine_cast(dm);
-	DevMonIo *io = g_malloc0(sizeof(DevMonIo) +
-				sizeof(struct ril_devmon_io *) * self->count);
-
-	io->pub.free = ril_devmon_combine_io_free;
-	io->impl = (struct ril_devmon_io**)(io + 1);
-	io->count = self->count;
-	for (i = 0; i < io->count; i++) {
-		io->impl[i] = ril_devmon_start_io(self->impl[i], chan, ci);
-	}
-	return &io->pub;
-}
-
-static void ril_devmon_combine_free(struct ril_devmon *dm)
-{
-	DevMon *self = ril_devmon_combine_cast(dm);
-	guint i;
-
-	for (i = 0; i < self->count; i++) {
-		ril_devmon_free(self->impl[i]);
-	}
-	g_free(self);
-}
-
-struct ril_devmon *ril_devmon_combine(struct ril_devmon *dm[], guint n)
-{
-	guint i;
-	DevMon *self = g_malloc0(sizeof(DevMon) +
-					sizeof(struct ril_devmon *) * n);
-
-	self->pub.free = ril_devmon_combine_free;
-	self->pub.start_io = ril_devmon_combine_start_io;
-	self->impl = (struct ril_devmon **)(self + 1);
-	self->count = n;
-	for (i = 0; i < n; i++) {
-		self->impl[i] = dm[i];
-	}
-	return &self->pub;
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_devmon_ds.c
+++ b/ofono/drivers/ril/ril_devmon_ds.c
@@ -65,8 +65,6 @@ typedef struct ril_devmon_ds {
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMon;

 typedef struct ril_devmon_ds_io {
@@ -88,8 +86,6 @@ typedef struct ril_devmon_ds_io {
 	gulong charger_event_id[CHARGER_EVENT_COUNT];
 	gulong display_event_id[DISPLAY_EVENT_COUNT];
 	guint req_id;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMonIo;

 #define DBG_(self,fmt,args...) DBG("%s: " fmt, (self)->io->name, ##args)
@@ -205,8 +201,8 @@ static void ril_devmon_ds_io_set_cell_info_update_interval(DevMonIo *self)
 		(ril_devmon_ds_display_on(self->display) &&
 			(ril_devmon_ds_charging(self->charger) ||
 				ril_devmon_ds_battery_ok(self->battery))) ?
-					self->cell_info_interval_short_ms :
-					self->cell_info_interval_long_ms);
+					RIL_CELL_INFO_INTERVAL_SHORT_MS :
+					RIL_CELL_INFO_INTERVAL_LONG_MS);
 }

 static void ril_devmon_ds_io_connman_cb(struct ril_connman *connman,
@@ -307,11 +303,6 @@ static struct ril_devmon_io *ril_devmon_ds_start_io(struct ril_devmon *devmon,
 		mce_display_add_state_changed_handler(self->display,
 			ril_devmon_ds_io_display_cb, self);

-	self->cell_info_interval_short_ms =
-				ds->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-				ds->cell_info_interval_long_ms;
-
 	ril_devmon_ds_io_update_low_data(self);
 	ril_devmon_ds_io_update_charging(self);
 	ril_devmon_ds_io_set_cell_info_update_interval(self);
@@ -329,7 +320,7 @@ static void ril_devmon_ds_free(struct ril_devmon *devmon)
 	g_free(self);
 }

-struct ril_devmon *ril_devmon_ds_new(const struct ril_slot_config *config)
+struct ril_devmon *ril_devmon_ds_new()
 {
 	DevMon *self = g_new0(DevMon, 1);

@@ -339,10 +330,6 @@ struct ril_devmon *ril_devmon_ds_new(const struct ril_slot_config *config)
 	self->battery = mce_battery_new();
 	self->charger = mce_charger_new();
 	self->display = mce_display_new();
-	self->cell_info_interval_short_ms =
-				config->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-				config->cell_info_interval_long_ms;
 	return &self->pub;
 }

--- a/ofono/drivers/ril/ril_devmon_ss.c
+++ b/ofono/drivers/ril/ril_devmon_ss.c
@@ -50,8 +50,6 @@ typedef struct ril_devmon_ss {
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMon;

 typedef struct ril_devmon_ss_io {
@@ -67,8 +65,6 @@ typedef struct ril_devmon_ss_io {
 	gulong charger_event_id[CHARGER_EVENT_COUNT];
 	gulong display_event_id[DISPLAY_EVENT_COUNT];
 	guint req_id;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMonIo;

 inline static DevMon *ril_devmon_ss_cast(struct ril_devmon *pub)
@@ -134,8 +130,8 @@ static void ril_devmon_ss_io_set_cell_info_update_interval(DevMonIo *self)
 	sailfish_cell_info_set_update_interval(self->cell_info,
 		(self->display_on && (ril_devmon_ss_charging(self->charger) ||
 				ril_devmon_ss_battery_ok(self->battery))) ?
-					self->cell_info_interval_short_ms :
-					self->cell_info_interval_long_ms);
+					RIL_CELL_INFO_INTERVAL_SHORT_MS :
+					RIL_CELL_INFO_INTERVAL_LONG_MS);
 }

 static void ril_devmon_ss_io_battery_cb(MceBattery *battery, void *user_data)
@@ -216,11 +212,6 @@ static struct ril_devmon_io *ril_devmon_ss_start_io(struct ril_devmon *devmon,
 		mce_display_add_state_changed_handler(self->display,
 			ril_devmon_ss_io_display_cb, self);

-	self->cell_info_interval_short_ms =
-			ss->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			ss->cell_info_interval_long_ms;
-
 	ril_devmon_ss_io_send_screen_state(self);
 	ril_devmon_ss_io_set_cell_info_update_interval(self);
 	return &self->pub;
@@ -236,7 +227,7 @@ static void ril_devmon_ss_free(struct ril_devmon *devmon)
 	g_free(self);
 }

-struct ril_devmon *ril_devmon_ss_new(const struct ril_slot_config *config)
+struct ril_devmon *ril_devmon_ss_new()
 {
 	DevMon *self = g_new0(DevMon, 1);

@@ -245,10 +236,6 @@ struct ril_devmon *ril_devmon_ss_new(const struct ril_slot_config *config)
 	self->battery = mce_battery_new();
 	self->charger = mce_charger_new();
 	self->display = mce_display_new();
-	self->cell_info_interval_short_ms =
-			config->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			config->cell_info_interval_long_ms;
 	return &self->pub;
 }

--- a/ofono/drivers/ril/ril_devmon_ur.c
+++ b/ofono/drivers/ril/ril_devmon_ur.c
@@ -1,267 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2019 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-
-#include "ril_devmon.h"
-
-#include <ofono/log.h>
-#include <ofono/ril-constants.h>
-
-#include <mce_battery.h>
-#include <mce_charger.h>
-#include <mce_display.h>
-
-#include <grilio_channel.h>
-#include <grilio_request.h>
-
-#include <gutil_macros.h>
-
-#define RIL_UR_ENABLE_ALL	(RIL_UR_SIGNAL_STRENGTH | \
-				RIL_UR_FULL_NETWORK_STATE | \
-				RIL_UR_DATA_CALL_DORMANCY_CHANGED)
-
-enum ril_devmon_ur_battery_event {
-	BATTERY_EVENT_VALID,
-	BATTERY_EVENT_STATUS,
-	BATTERY_EVENT_COUNT
-};
-
-enum ril_devmon_ur_charger_event {
-	CHARGER_EVENT_VALID,
-	CHARGER_EVENT_STATE,
-	CHARGER_EVENT_COUNT
-};
-
-enum ril_devmon_ur_display_event {
-	DISPLAY_EVENT_VALID,
-	DISPLAY_EVENT_STATE,
-	DISPLAY_EVENT_COUNT
-};
-
-typedef struct ril_devmon_ur {
-	struct ril_devmon pub;
-	MceBattery *battery;
-	MceCharger *charger;
-	MceDisplay *display;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
-} DevMon;
-
-typedef struct ril_devmon_ur_io {
-	struct ril_devmon_io pub;
-	struct sailfish_cell_info *cell_info;
-	MceBattery *battery;
-	MceCharger *charger;
-	MceDisplay *display;
-	GRilIoChannel *io;
-	gboolean display_on;
-	gboolean unsol_filter_supported;
-	gulong battery_event_id[BATTERY_EVENT_COUNT];
-	gulong charger_event_id[CHARGER_EVENT_COUNT];
-	gulong display_event_id[DISPLAY_EVENT_COUNT];
-	guint req_id;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
-} DevMonIo;
-
-#define DBG_(self,fmt,args...) DBG("%s: " fmt, (self)->io->name, ##args)
-
-inline static DevMon *ril_devmon_ur_cast(struct ril_devmon *pub)
-{
-	return G_CAST(pub, DevMon, pub);
-}
-
-inline static DevMonIo *ril_devmon_ur_io_cast(struct ril_devmon_io *pub)
-{
-	return G_CAST(pub, DevMonIo, pub);
-}
-
-static inline gboolean ril_devmon_ur_battery_ok(MceBattery *battery)
-{
-	return battery->valid && battery->status >= MCE_BATTERY_OK;
-}
-
-static inline gboolean ril_devmon_ur_charging(MceCharger *charger)
-{
-	return charger->valid && charger->state == MCE_CHARGER_ON;
-}
-
-static gboolean ril_devmon_ur_display_on(MceDisplay *display)
-{
-	return display->valid && display->state != MCE_DISPLAY_STATE_OFF;
-}
-
-static void ril_devmon_ur_io_unsol_response_filter_sent(GRilIoChannel *io,
-				int status, const void *data, guint len,
-				void *user_data)
-{
-	DevMonIo *self = user_data;
-
-	self->req_id = 0;
-	if (status == RIL_E_REQUEST_NOT_SUPPORTED) {
-		/* This is a permanent failure */
-		DBG_(self, "Unsolicited response filter is not supported");
-		self->unsol_filter_supported = FALSE;
-	}
-}
-
-static void ril_devmon_ur_io_set_unsol_response_filter(DevMonIo *self)
-{
-	if (self->unsol_filter_supported) {
-		const gint32 value = self->display_on ? RIL_UR_ENABLE_ALL : 0;
-		GRilIoRequest *req = grilio_request_array_int32_new(1, value);
-
-		DBG_(self, "Setting unsolicited response filter: %u", value);
-
-		grilio_channel_cancel_request(self->io, self->req_id, FALSE);
-		self->req_id =
-			grilio_channel_send_request_full(self->io, req,
-				RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER,
-				ril_devmon_ur_io_unsol_response_filter_sent,
-				NULL, self);
-		grilio_request_unref(req);
-	}
-}
-
-static void ril_devmon_ur_io_set_cell_info_update_interval(DevMonIo *self)
-{
-	sailfish_cell_info_set_update_interval(self->cell_info,
-		(self->display_on && (ril_devmon_ur_charging(self->charger) ||
-				ril_devmon_ur_battery_ok(self->battery))) ?
-					self->cell_info_interval_short_ms :
-					self->cell_info_interval_long_ms);
-}
-
-static void ril_devmon_ur_io_battery_cb(MceBattery *battery, void *user_data)
-{
-	ril_devmon_ur_io_set_cell_info_update_interval(user_data);
-}
-
-static void ril_devmon_ur_io_charger_cb(MceCharger *charger, void *user_data)
-{
-	ril_devmon_ur_io_set_cell_info_update_interval(user_data);
-}
-
-static void ril_devmon_ur_io_display_cb(MceDisplay *display, void *user_data)
-{
-	DevMonIo *self = user_data;
-	const gboolean display_on = ril_devmon_ur_display_on(display);
-
-	if (self->display_on != display_on) {
-		self->display_on = display_on;
-		ril_devmon_ur_io_set_unsol_response_filter(self);
-		ril_devmon_ur_io_set_cell_info_update_interval(self);
-	}
-}
-
-static void ril_devmon_ur_io_free(struct ril_devmon_io *devmon_io)
-{
-	DevMonIo *self = ril_devmon_ur_io_cast(devmon_io);
-
-	mce_battery_remove_all_handlers(self->battery, self->battery_event_id);
-	mce_battery_unref(self->battery);
-
-	mce_charger_remove_all_handlers(self->charger, self->charger_event_id);
-	mce_charger_unref(self->charger);
-
-	mce_display_remove_all_handlers(self->display, self->display_event_id);
-	mce_display_unref(self->display);
-
-	grilio_channel_cancel_request(self->io, self->req_id, FALSE);
-	grilio_channel_unref(self->io);
-
-	sailfish_cell_info_unref(self->cell_info);
-	g_free(self);
-}
-
-static struct ril_devmon_io *ril_devmon_ur_start_io(struct ril_devmon *devmon,
-		GRilIoChannel *io, struct sailfish_cell_info *cell_info)
-{
-	DevMon *ur = ril_devmon_ur_cast(devmon);
-	DevMonIo *self = g_new0(DevMonIo, 1);
-
-	self->pub.free = ril_devmon_ur_io_free;
-	self->unsol_filter_supported = TRUE;
-	self->io = grilio_channel_ref(io);
-	self->cell_info = sailfish_cell_info_ref(cell_info);
-
-	self->battery = mce_battery_ref(ur->battery);
-	self->battery_event_id[BATTERY_EVENT_VALID] =
-		mce_battery_add_valid_changed_handler(self->battery,
-			ril_devmon_ur_io_battery_cb, self);
-	self->battery_event_id[BATTERY_EVENT_STATUS] =
-		mce_battery_add_status_changed_handler(self->battery,
-			ril_devmon_ur_io_battery_cb, self);
-
-	self->charger = mce_charger_ref(ur->charger);
-	self->charger_event_id[CHARGER_EVENT_VALID] =
-		mce_charger_add_valid_changed_handler(self->charger,
-			ril_devmon_ur_io_charger_cb, self);
-	self->charger_event_id[CHARGER_EVENT_STATE] =
-		mce_charger_add_state_changed_handler(self->charger,
-			ril_devmon_ur_io_charger_cb, self);
-
-	self->display = mce_display_ref(ur->display);
-	self->display_on = ril_devmon_ur_display_on(self->display);
-	self->display_event_id[DISPLAY_EVENT_VALID] =
-		mce_display_add_valid_changed_handler(self->display,
-			ril_devmon_ur_io_display_cb, self);
-	self->display_event_id[DISPLAY_EVENT_STATE] =
-		mce_display_add_state_changed_handler(self->display,
-			ril_devmon_ur_io_display_cb, self);
-
-	self->cell_info_interval_short_ms =
-			ur->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			ur->cell_info_interval_long_ms;
-
-	ril_devmon_ur_io_set_unsol_response_filter(self);
-	ril_devmon_ur_io_set_cell_info_update_interval(self);
-	return &self->pub;
-}
-
-static void ril_devmon_ur_free(struct ril_devmon *devmon)
-{
-	DevMon *self = ril_devmon_ur_cast(devmon);
-
-	mce_battery_unref(self->battery);
-	mce_charger_unref(self->charger);
-	mce_display_unref(self->display);
-	g_free(self);
-}
-
-struct ril_devmon *ril_devmon_ur_new(const struct ril_slot_config *config)
-{
-	DevMon *self = g_new0(DevMon, 1);
-
-	self->pub.free = ril_devmon_ur_free;
-	self->pub.start_io = ril_devmon_ur_start_io;
-	self->battery = mce_battery_new();
-	self->charger = mce_charger_new();
-	self->display = mce_display_new();
-	self->cell_info_interval_short_ms =
-			config->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			config->cell_info_interval_long_ms;
-	return &self->pub;
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_gprs_context.c
+++ b/ofono/drivers/ril/ril_gprs_context.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -29,7 +29,7 @@

 #define CTX_ID_NONE ((unsigned int)(-1))

-#define MAX_MMS_MTU 1280
+#define MAX_MTU 1280

 struct ril_gprs_context_call {
 	struct ril_data_request *req;
@@ -108,15 +108,8 @@ static void ril_gprs_context_set_active_call(struct ril_gprs_context *gcd,
 	if (call) {
 		ril_data_call_free(gcd->active_call);
 		gcd->active_call = ril_data_call_dup(call);
-		if (ofono_gprs_context_get_type(gcd->gc) ==
-					OFONO_GPRS_CONTEXT_TYPE_MMS) {
-			/*
-			 * Some MMS providers have a problem with MTU
-			 * greater than 1280. Let's be safe.
-			 */
-			if (!gcd->mtu_watch) {
-				gcd->mtu_watch = mtu_watch_new(MAX_MMS_MTU);
-			}
+		if (!gcd->mtu_watch) {
+			gcd->mtu_watch = mtu_watch_new(MAX_MTU);
 		}
 		mtu_watch_set_ifname(gcd->mtu_watch, call->ifname);
 		ril_data_call_grab(gcd->data, call->cid, gcd);
@@ -254,59 +247,34 @@ static void ril_gprs_context_set_gateway(struct ofono_gprs_context *gc,
 	ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
 }

-typedef void (*ofono_gprs_context_list_setter_t)(struct ofono_gprs_context *gc,
-				const char **list);
-
-static void ril_gprs_context_set_servers(struct ofono_gprs_context *gc,
-		char * const *list, ofono_gprs_context_list_setter_t set_ipv4,
-		ofono_gprs_context_list_setter_t set_ipv6)
+static void ril_gprs_context_set_dns_servers(struct ofono_gprs_context *gc,
+					const struct ril_data_call *call)
 {
 	int i;
-	const char **ip_list = NULL, **ip_ptr = NULL;
-	const char **ipv6_list = NULL, **ipv6_ptr = NULL;
+	char * const *list = call->dnses;
 	const int n = gutil_strv_length(list);
+	const char **ip_dns = g_new0(const char *, n+1);
+	const char **ipv6_dns = g_new0(const char *, n+1);
+	const char **ip_ptr = ip_dns;
+	const char **ipv6_ptr = ipv6_dns;

 	for (i = 0; i < n; i++) {
 		const char *addr = list[i];
 		switch (ril_gprs_context_address_family(addr)) {
 		case AF_INET:
-			if (!ip_ptr) {
-				ip_list = g_new0(const char *, n - i + 1);
-				ip_ptr = ip_list;
-			}
 			*ip_ptr++ = addr;
 			break;
 		case AF_INET6:
-			if (!ipv6_ptr) {
-				ipv6_list = g_new0(const char *, n - i + 1);
-				ipv6_ptr = ipv6_list;
-			}
 			*ipv6_ptr++ = addr;
 			break;
 		}
 	}

-	set_ipv4(gc, ip_list);
-	set_ipv6(gc, ipv6_list);
+	ofono_gprs_context_set_ipv4_dns_servers(gc, ip_dns);
+	ofono_gprs_context_set_ipv6_dns_servers(gc, ipv6_dns);

-	g_free(ip_list);
-	g_free(ipv6_list);
-}
-
-static void ril_gprs_context_set_dns_servers(struct ofono_gprs_context *gc,
-					const struct ril_data_call *call)
-{
-	ril_gprs_context_set_servers(gc, call->dnses,
-				ofono_gprs_context_set_ipv4_dns_servers,
-				ofono_gprs_context_set_ipv6_dns_servers);
-}
-
-static void ril_gprs_context_set_proxy_cscf(struct ofono_gprs_context *gc,
-					const struct ril_data_call *call)
-{
-	ril_gprs_context_set_servers(gc, call->pcscf,
-				ofono_gprs_context_set_ipv4_proxy_cscf,
-				ofono_gprs_context_set_ipv6_proxy_cscf);
+	g_free(ip_dns);
+	g_free(ipv6_dns);
 }

 /* Only compares the stuff that's important to us */
@@ -314,8 +282,7 @@ static void ril_gprs_context_set_proxy_cscf(struct ofono_gprs_context *gc,
 #define DATA_CALL_ADDRESS_CHANGED   (0x02)
 #define DATA_CALL_GATEWAY_CHANGED   (0x04)
 #define DATA_CALL_DNS_CHANGED       (0x08)
-#define DATA_CALL_PCSCF_CHANGED     (0x10)
-#define DATA_CALL_ALL_CHANGED       (0x1f)
+#define DATA_CALL_ALL_CHANGED       (0x0f)
 static int ril_gprs_context_data_call_change(
 			const struct ril_data_call *c1,
 			const struct ril_data_call *c2)
@@ -341,10 +308,6 @@ static int ril_gprs_context_data_call_change(
 			changes |= DATA_CALL_DNS_CHANGED;
 		}

-		if (!gutil_strv_equal(c1->pcscf, c2->pcscf)) {
-			changes |= DATA_CALL_PCSCF_CHANGED;
-		}
-
 		return changes;
 	} else {
 		return DATA_CALL_ALL_CHANGED;
@@ -417,11 +380,6 @@ static void ril_gprs_context_call_list_changed(struct ril_data *data, void *arg)
 		ril_gprs_context_set_dns_servers(gc, call);
 	}

-	if (change & DATA_CALL_PCSCF_CHANGED) {
-		DBG("P-CSCF changed");
-		ril_gprs_context_set_proxy_cscf(gc, call);
-	}
-
 	ofono_gprs_context_signal_change(gc, gcd->active_ctx_cid);
 	ril_data_call_free(prev_call);
 }
@@ -463,7 +421,6 @@ static void ril_gprs_context_activate_primary_cb(struct ril_data *data,
 		ril_gprs_context_set_address(gc, call);
 		ril_gprs_context_set_gateway(gc, call);
 		ril_gprs_context_set_dns_servers(gc, call);
-		ril_gprs_context_set_proxy_cscf(gc, call);
 		ril_error_init_ok(&error);
 	}

--- a/ofono/drivers/ril/ril_modem.c
+++ b/ofono/drivers/ril/ril_modem.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -29,6 +29,7 @@

 #include <ofono/watch.h>

+#define MAX_PDP_CONTEXTS        (2)
 #define ONLINE_TIMEOUT_SECS     (15) /* 20 sec is hardcoded in ofono core */

 enum ril_modem_power_state {
@@ -218,21 +219,22 @@ static void ril_modem_schedule_online_check(struct ril_modem_data *md)
 static void ril_modem_update_radio_settings(struct ril_modem_data *md)
 {
 	struct ril_modem *m = &md->modem;
-	struct ofono_radio_settings *rs = ril_modem_radio_settings(m);
-
-	if (md->watch->imsi) {
+	if (m->radio->state == RADIO_STATE_ON && md->watch->imsi) {
 		/* radio-settings.c assumes that IMSI is available */
-		if (!rs) {
+		if (!ril_modem_radio_settings(m)) {
 			DBG_(md, "initializing radio settings interface");
 			ofono_radio_settings_create(m->ofono, 0,
 						RILMODEM_DRIVER, md);
 		}
-	} else if (rs) {
-		DBG_(md, "removing radio settings interface");
-		ofono_radio_settings_remove(rs);
 	} else {
 		/* ofono core may remove radio settings atom internally */
-		DBG_(md, "radio settings interface is already gone");
+		struct ofono_radio_settings *rs = ril_modem_radio_settings(m);
+		if (rs) {
+			DBG_(md, "removing radio settings interface");
+			ofono_radio_settings_remove(rs);
+		} else {
+			DBG_(md, "radio settings interface is already gone");
+		}
 	}
 }

@@ -241,6 +243,7 @@ static void ril_modem_radio_state_cb(struct ril_radio *radio, void *data)
 	struct ril_modem_data *md = data;

 	GASSERT(md->modem.radio == radio);
+	ril_modem_update_radio_settings(md);
 	ril_modem_update_online_state(md);
 }

@@ -304,22 +307,15 @@ static void ril_modem_post_sim(struct ofono_modem *modem)
 	ofono_sms_create(modem, 0, RILMODEM_DRIVER, md);
 	gprs = ofono_gprs_create(modem, 0, RILMODEM_DRIVER, md);
 	if (gprs) {
-		guint i;
-		static const enum ofono_gprs_context_type ap_types[] = {
-			OFONO_GPRS_CONTEXT_TYPE_INTERNET,
-			OFONO_GPRS_CONTEXT_TYPE_MMS,
-			OFONO_GPRS_CONTEXT_TYPE_IMS
-		};
+		int i;

-		/* Create a context for each type */
-		for (i = 0; i < G_N_ELEMENTS(ap_types); i++) {
+		for (i = 0; i < MAX_PDP_CONTEXTS; i++) {
 			struct ofono_gprs_context *gc =
 				ofono_gprs_context_create(modem, 0,
 						RILMODEM_DRIVER, md);
 			if (gc == NULL)
 				break;

-			ofono_gprs_context_set_type(gc, ap_types[i]);
 			ofono_gprs_add_context(gprs, gc);
 		}
 	}
@@ -340,7 +336,6 @@ static void ril_modem_post_sim(struct ofono_modem *modem)
 	if (md->modem.config.enable_cbs) {
 		ofono_cbs_create(modem, 0, RILMODEM_DRIVER, md);
 	}
-	ofono_sim_auth_create(modem);
 }

 static void ril_modem_post_online(struct ofono_modem *modem)
@@ -422,9 +417,7 @@ static void ril_modem_remove(struct ofono_modem *ofono)
 	ofono_modem_set_data(ofono, NULL);

 	ril_radio_remove_handler(modem->radio, md->radio_state_event_id);
-	ril_radio_set_online(modem->radio, FALSE);
 	ril_radio_power_off(modem->radio, RADIO_POWER_TAG(md));
-	ril_radio_set_online(modem->radio, FALSE);
 	ril_radio_unref(modem->radio);
 	ril_sim_settings_unref(modem->sim_settings);

--- a/ofono/drivers/ril/ril_netreg.c
+++ b/ofono/drivers/ril/ril_netreg.c
@@ -20,12 +20,10 @@
 #include "ril_vendor.h"
 #include "ril_log.h"

-#include "ofono.h"
 #include "common.h"
 #include "simutil.h"

-#include <ofono/watch.h>
-
+#define REGISTRATION_TIMEOUT (100*1000) /* ms */
 #define REGISTRATION_MAX_RETRIES (2)

 enum ril_netreg_events {
@@ -43,11 +41,9 @@ enum ril_netreg_network_events {
 struct ril_netreg {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
-	gboolean replace_strange_oper;
 	gboolean network_selection_manual_0;
 	int signal_strength_dbm_weak;
 	int signal_strength_dbm_strong;
-	struct ofono_watch *watch;
 	struct ofono_netreg *netreg;
 	struct ril_network *network;
 	struct ril_vendor *vendor;
@@ -57,7 +53,6 @@ struct ril_netreg {
 	guint current_operator_id;
 	gulong ril_event_id[NETREG_RIL_EVENT_COUNT];
 	gulong network_event_id[NETREG_NETWORK_EVENT_COUNT];
-	int network_selection_timeout;
 };

 struct ril_netreg_cbd {
@@ -197,74 +192,11 @@ static void ril_netreg_current_operator(struct ofono_netreg *netreg,
 					ril_netreg_cbd_free);
 }

-static gboolean ril_netreg_strange(const struct ofono_network_operator *op,
-							struct ofono_sim *sim)
-{
-	gsize mcclen;
-
-	if (sim && op->status != OPERATOR_STATUS_CURRENT) {
-		const char *spn = ofono_sim_get_spn(sim);
-		const char *mcc = ofono_sim_get_mcc(sim);
-		const char *mnc = ofono_sim_get_mnc(sim);
-
-		if (spn && mcc && mnc && !strcmp(op->name, spn) &&
-			(strcmp(op->mcc, mcc) || strcmp(op->mnc, mnc))) {
-			/*
-			 * Status is not "current", SPN matches the SIM, but
-			 * MCC and/or MNC don't (e.g. Sony Xperia X where all
-			 * operators could be reported with the same name
-			 * which equals SPN).
-			 */
-			DBG("%s %s%s (sim spn?)", op->name, op->mcc, op->mnc);
-			return TRUE;
-		}
-	}
-
-	mcclen = strlen(op->mcc);
-	if (!strncmp(op->name, op->mcc, mcclen) &&
-				!strcmp(op->name + mcclen, op->mnc)) {
-		/* Some MediaTek RILs only report numeric operator name */
-		DBG("%s %s%s (numeric?)", op->name, op->mcc, op->mnc);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void ril_netreg_process_operators(struct ril_netreg *nd,
-			struct ofono_network_operator *ops, int nops)
-{
-	if (nd->replace_strange_oper) {
-		int i;
-
-		for (i = 0; i < nops; i++) {
-			struct ofono_network_operator *op = ops + i;
-			struct ofono_gprs_provision_data *prov = NULL;
-			int np = 0;
-
-			if (ril_netreg_strange(op, nd->watch->sim) &&
-				__ofono_gprs_provision_get_settings(op->mcc,
-						op->mnc, NULL, &prov, &np)) {
-				/* Use the first entry */
-				if (np > 0 && prov->provider_name &&
-						prov->provider_name[0]) {
-					DBG("%s %s%s -> %s", op->name, op->mcc,
-						op->mnc, prov->provider_name);
-					strncpy(op->name, prov->provider_name,
-						OFONO_MAX_OPERATOR_NAME_LENGTH);
-				}
-				__ofono_gprs_provision_free_settings(prov, np);
-			}
-		}
-	}
-}
-
 static void ril_netreg_list_operators_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
 	struct ril_netreg_cbd *cbd = user_data;
 	ofono_netreg_operator_list_cb_t cb = cbd->cb.operator_list;
-	struct ril_netreg *nd = cbd->nd;
 	struct ofono_network_operator *list;
 	struct ofono_error error;
 	int noperators = 0, i;
@@ -306,23 +238,21 @@ static void ril_netreg_list_operators_cb(GRilIoChannel *io, int status,
 		}

 		/* Set the proper status  */
-		if (!status) {
-			op->status = OPERATOR_STATUS_UNKNOWN;
-		} else if (!strcmp(status, "available")) {
-			op->status = OPERATOR_STATUS_AVAILABLE;
+		if (!strcmp(status, "available")) {
+			list[i].status = OPERATOR_STATUS_AVAILABLE;
 		} else if (!strcmp(status, "current")) {
-			op->status = OPERATOR_STATUS_CURRENT;
+			list[i].status = OPERATOR_STATUS_CURRENT;
 		} else if (!strcmp(status, "forbidden")) {
-			op->status = OPERATOR_STATUS_FORBIDDEN;
+			list[i].status = OPERATOR_STATUS_FORBIDDEN;
 		} else {
-			op->status = OPERATOR_STATUS_UNKNOWN;
+			list[i].status = OPERATOR_STATUS_UNKNOWN;
 		}

 		op->tech = -1;
 		ok = ril_parse_mcc_mnc(numeric, op);
 		if (ok) {
 			if (op->tech < 0) {
-				op->tech = nd->network->voice.access_tech;
+				op->tech = cbd->nd->network->voice.access_tech;
 			}
 			DBG("[operator=%s, %s, %s, status: %s]", op->name,
 						op->mcc, op->mnc, status);
@@ -337,7 +267,6 @@ static void ril_netreg_list_operators_cb(GRilIoChannel *io, int status,
 	}

 	if (ok) {
-		ril_netreg_process_operators(nd, list, noperators);
 		cb(ril_error_ok(&error), noperators, list, cbd->data);
 	} else {
 		cb(ril_error_failure(&error), 0, NULL, cbd->data);
@@ -372,55 +301,18 @@ static void ril_netreg_register_cb(GRilIoChannel *io, int status,
 	}
 }

-static void ril_netreg_set_register_auto(struct ril_netreg *nd,
-				ofono_netreg_register_cb_t cb, void *data)
-{
-	GRilIoRequest *req = grilio_request_new();
-
-	ofono_info("nw select automatic");
-	grilio_request_set_timeout(req, nd->network_selection_timeout);
-	grilio_request_set_retry(req, 0, REGISTRATION_MAX_RETRIES);
-	grilio_queue_send_request_full(nd->q, req,
-			RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC,
-			ril_netreg_register_cb, ril_netreg_cbd_free,
-			ril_netreg_cbd_new(nd, cb, data));
-	grilio_request_unref(req);
-}
-
-static void ril_netreg_query_register_auto_cb(GRilIoChannel *io, int status,
-					const void *data, guint len,
-					void *user_data)
-{
-	struct ril_netreg_cbd *cbd = user_data;
-	ofono_netreg_register_cb_t cb = cbd->cb.reg;
-
-	if (status == RIL_E_SUCCESS) {
-		GRilIoParser rilp;
-		gint32 net_mode;
-
-		grilio_parser_init(&rilp, data, len);
-		if (grilio_parser_get_int32(&rilp, NULL) /* Array length */ &&
-				grilio_parser_get_int32(&rilp, &net_mode) && 
-				net_mode == RIL_NETWORK_SELECTION_MODE_AUTO) {
-			struct ofono_error error;
-			ofono_info("nw selection is already auto");
-			cb(ril_error_ok(&error), cbd->data);
-			return;
-		}
-	}
-
-	ril_netreg_set_register_auto(cbd->nd, cb, cbd->data);
-}
-
 static void ril_netreg_register_auto(struct ofono_netreg *netreg,
 				ofono_netreg_register_cb_t cb, void *data)
 {
 	struct ril_netreg *nd = ril_netreg_get_data(netreg);
 	GRilIoRequest *req = grilio_request_new();

+	ofono_info("nw select automatic");
+	grilio_request_set_timeout(req, REGISTRATION_TIMEOUT);
+	grilio_request_set_retry(req, 0, REGISTRATION_MAX_RETRIES);
 	grilio_queue_send_request_full(nd->q, req,
-			RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE,
-			ril_netreg_query_register_auto_cb, ril_netreg_cbd_free,
+			RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC,
+			ril_netreg_register_cb, ril_netreg_cbd_free,
 			ril_netreg_cbd_new(nd, cb, data));
 	grilio_request_unref(req);
 }
@@ -435,7 +327,8 @@ static void ril_netreg_register_manual(struct ofono_netreg *netreg,

 	ofono_info("nw select manual: %s%s%s", mcc, mnc, suffix);
 	grilio_request_append_format(req, "%s%s%s", mcc, mnc, suffix);
-	grilio_request_set_timeout(req, nd->network_selection_timeout);
+	grilio_request_set_timeout(req, REGISTRATION_TIMEOUT);
+	grilio_request_set_retry(req, 0, REGISTRATION_MAX_RETRIES);
 	grilio_queue_send_request_full(nd->q, req,
 			RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
 			ril_netreg_register_cb, ril_netreg_cbd_free,
@@ -502,7 +395,7 @@ static int ril_netreg_get_signal_strength(struct ril_netreg *nd,
 			signal.qdbm = -4 * tdscdma_dbm;
 		} else if (signal.lte == 99 && rsrp >= 44 && rsrp <= 140) {
 			/* RSRP range: 44 to 140 dBm per 3GPP TS 36.133 */
-			signal.qdbm = -4 * rsrp;
+			signal.qdbm = -rsrp;
 		}
 	}

@@ -664,15 +557,12 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 	DBG_(nd, "%p", netreg);
 	nd->io = grilio_channel_ref(ril_modem_io(modem));
 	nd->q = grilio_queue_new(nd->io);
-	nd->watch = ofono_watch_new(ril_modem_get_path(modem));
 	nd->vendor = ril_vendor_ref(modem->vendor);
 	nd->network = ril_network_ref(modem->network);
 	nd->netreg = netreg;
-	nd->replace_strange_oper = config->replace_strange_oper;
 	nd->network_selection_manual_0 = config->network_selection_manual_0;
 	nd->signal_strength_dbm_weak = config->signal_strength_dbm_weak;
 	nd->signal_strength_dbm_strong = config->signal_strength_dbm_strong;
-	nd->network_selection_timeout = config->network_selection_timeout;

 	ofono_netreg_set_data(netreg, nd);
 	nd->timer_id = g_idle_add(ril_netreg_register, nd);
@@ -699,7 +589,6 @@ static void ril_netreg_remove(struct ofono_netreg *netreg)
 		g_source_remove(nd->current_operator_id);
 	}

-	ofono_watch_unref(nd->watch);
 	ril_network_remove_all_handlers(nd->network, nd->network_event_id);
 	ril_network_unref(nd->network);
 	ril_vendor_unref(nd->vendor);
--- a/ofono/drivers/ril/ril_network.c
+++ b/ofono/drivers/ril/ril_network.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2015-2020 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -18,7 +18,6 @@

 #include "ril_network.h"
 #include "ril_radio.h"
-#include "ril_radio_caps.h"
 #include "ril_sim_card.h"
 #include "ril_sim_settings.h"
 #include "ril_vendor.h"
@@ -36,7 +35,6 @@
 #include <ofono/watch.h>
 #include <ofono/gprs.h>

-#include "ofono.h"
 #include "common.h"

 #define SET_PREF_MODE_HOLDOFF_SEC RIL_RETRY_SECS
@@ -56,12 +54,6 @@ enum ril_network_radio_event {
 	RADIO_EVENT_COUNT
 };

-enum ril_network_radio_caps_mgr_events {
-	RADIO_CAPS_MGR_TX_DONE,
-	RADIO_CAPS_MGR_TX_ABORTED,
-	RADIO_CAPS_MGR_EVENT_COUNT
-};
-
 enum ril_network_sim_events {
 	SIM_EVENT_STATUS_CHANGED,
 	SIM_EVENT_IO_ACTIVE_CHANGED,
@@ -70,6 +62,7 @@ enum ril_network_sim_events {

 enum ril_network_unsol_event {
 	UNSOL_EVENT_NETWORK_STATE,
+	UNSOL_EVENT_RADIO_CAPABILITY,
 	UNSOL_EVENT_COUNT
 };

@@ -97,7 +90,6 @@ struct ril_network_priv {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
 	struct ril_radio *radio;
-	struct ril_radio_caps *caps;
 	struct ril_sim_card *simcard;
 	struct ril_vendor *vendor;
 	struct ofono_watch *watch;
@@ -114,8 +106,6 @@ struct ril_network_priv {
 	gulong set_rat_id;
 	gulong unsol_event_id[UNSOL_EVENT_COUNT];
 	gulong settings_event_id;
-	gulong supported_modes_event_id;
-	gulong caps_mgr_event_id[RADIO_CAPS_MGR_EVENT_COUNT];
 	gulong radio_event_id[RADIO_EVENT_COUNT];
 	gulong simcard_event_id[SIM_EVENT_COUNT];
 	gulong watch_ids[WATCH_EVENT_COUNT];
@@ -135,6 +125,7 @@ enum ril_network_signal {
 	SIGNAL_VOICE_STATE_CHANGED,
 	SIGNAL_DATA_STATE_CHANGED,
 	SIGNAL_PREF_MODE_CHANGED,
+	SIGNAL_MAX_PREF_MODE_CHANGED,
 	SIGNAL_COUNT
 };

@@ -142,6 +133,7 @@ enum ril_network_signal {
 #define SIGNAL_VOICE_STATE_CHANGED_NAME   "ril-network-voice-state-changed"
 #define SIGNAL_DATA_STATE_CHANGED_NAME    "ril-network-data-state-changed"
 #define SIGNAL_PREF_MODE_CHANGED_NAME     "ril-network-pref-mode-changed"
+#define SIGNAL_MAX_PREF_MODE_CHANGED_NAME "ril-network-max-pref-mode-changed"

 static guint ril_network_signals[SIGNAL_COUNT] = { 0 };

@@ -427,30 +419,18 @@ static void ril_network_poll_data_state_cb(GRilIoChannel *io, int req_status,
 	}
 }

-static gboolean ril_network_retry(GRilIoRequest* request, int ril_status,
-		const void* response_data, guint response_len, void* user_data)
-{
-	switch (ril_status) {
-	case RIL_E_SUCCESS:
-	case RIL_E_RADIO_NOT_AVAILABLE:
-		return FALSE;
-	default:
-		return TRUE;
-	}
-}
-
 static guint ril_network_poll_and_retry(struct ril_network *self, guint id,
 					int code, GRilIoChannelResponseFunc fn)
 {
 	struct ril_network_priv *priv = self->priv;

-	/* Don't wait for retry timeout to expire */
-	if (!id || !grilio_channel_retry_request(priv->io, id)) {
+	if (id) {
+		/* Retry right away, don't wait for retry timeout to expire */
+		grilio_channel_retry_request(priv->io, id);
+	} else {
 		GRilIoRequest *req = grilio_request_new();

 		grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
-		grilio_request_set_retry_func(req, ril_network_retry);
-		grilio_queue_cancel_request(priv->q, id, FALSE);
 		id = grilio_queue_send_request_full(priv->q, req, code, fn,
 								NULL, self);
 		grilio_request_unref(req);
@@ -532,17 +512,6 @@ static int ril_network_mode_to_rat(struct ril_network *self,
 	}
 }

-enum ofono_radio_access_mode ril_network_max_supported_mode
-						(struct ril_network *self)
-{
-	struct ril_sim_settings *settings = self->settings;
-	struct ril_network_priv *priv = self->priv;
-	const struct ril_radio_caps *caps = priv->caps;
-
-	return caps ? __ofono_radio_access_max_mode(caps->supported_modes) :
-				__ofono_radio_access_max_mode(settings->techs);
-}
-
 static enum ofono_radio_access_mode ril_network_actual_pref_mode
 						(struct ril_network *self)
 {
@@ -566,16 +535,9 @@ static enum ofono_radio_access_mode ril_network_actual_pref_mode
 	 * and max_pref_mode are not ANY, we pick the smallest value.
 	 * Otherwise we take any non-zero value if there is one.
 	 */
-	const enum ofono_radio_access_mode pref_mode =
-		(settings->pref_mode && max_pref_mode) ?
+	return (settings->pref_mode && max_pref_mode) ?
 		MIN(settings->pref_mode, max_pref_mode) :
 		settings->pref_mode ? settings->pref_mode : max_pref_mode;
-
-	/* Do not try to set unsupported mode */
-	const enum ofono_radio_access_mode max_mode =
-				ril_network_max_supported_mode(self);
-
-	return pref_mode ? MIN(pref_mode, max_mode) : max_mode;
 }

 static gboolean ril_network_need_initial_attach_apn(struct ril_network *self)
@@ -586,9 +548,9 @@ static gboolean ril_network_need_initial_attach_apn(struct ril_network *self)

 	if (watch->gprs && radio->state == RADIO_STATE_ON) {
 		switch (ril_network_actual_pref_mode(self)) {
+		case OFONO_RADIO_ACCESS_MODE_ANY:
 		case OFONO_RADIO_ACCESS_MODE_LTE:
 			return TRUE;
-		case OFONO_RADIO_ACCESS_MODE_ANY:
 		case OFONO_RADIO_ACCESS_MODE_UMTS:
 		case OFONO_RADIO_ACCESS_MODE_GSM:
 			break;
@@ -696,7 +658,7 @@ struct ril_network_data_profile *ril_network_data_profile_new
 	ptr += G_ALIGN8(sizeof(*profile));

 	profile->profile_id = profile_id;
-	profile->type = RIL_PROFILE_COMMON;
+	profile->type = RIL_PROFILE_3GPP;
 	profile->auth_method = auth_method;
 	profile->proto = context->proto;
 	profile->enabled = TRUE;
@@ -825,9 +787,6 @@ static void ril_network_check_data_profiles(struct ril_network *self)
 		const struct ofono_gprs_primary_context* mms =
 			ofono_gprs_context_settings_by_type(gprs,
 				OFONO_GPRS_CONTEXT_TYPE_MMS);
-		const struct ofono_gprs_primary_context* ims =
-			ofono_gprs_context_settings_by_type(gprs,
-				OFONO_GPRS_CONTEXT_TYPE_IMS);
 		GSList *l = NULL;

 		if (internet) {
@@ -843,12 +802,6 @@ static void ril_network_check_data_profiles(struct ril_network *self)
 				ril_network_data_profile_new(mms,
 					priv->mms_data_profile_id));
 		}
-		if (ims) {
-			DBG_(self, "ims apn \"%s\"", ims->apn);
-			l = g_slist_append(l,
-				ril_network_data_profile_new(ims,
-					RIL_DATA_PROFILE_IMS));
-		}

 		if (ril_network_data_profiles_equal(priv->data_profiles, l)) {
 			ril_network_data_profiles_free(l);
@@ -1002,14 +955,6 @@ static void ril_network_check_pref_mode(struct ril_network *self,
 	}
 }

-static void ril_network_assert_pref_mode(struct ril_network *self)
-{
-	struct ril_network_priv *priv = self->priv;
-
-	priv->assert_rat = TRUE;
-	ril_network_check_pref_mode(self, FALSE);
-}
-
 static int ril_network_parse_pref_resp(const void *data, guint len)
 {
 	GRilIoParser rilp;
@@ -1039,10 +984,10 @@ static void ril_network_startup_query_pref_mode_cb(GRilIoChannel *io,
 		}

 		/*
-		 * At startup, the device may have an inconsistency between
-		 * voice and data network modes, so it needs to be asserted.
+		 * Unlike ril_network_query_pref_mode_cb, this one always
+		 * checks the preferred mode.
 		 */
-		ril_network_assert_pref_mode(self);
+		ril_network_check_pref_mode(self, FALSE);
 	}
 }

@@ -1053,22 +998,22 @@ static void ril_network_query_pref_mode_cb(GRilIoChannel *io, int status,
 	struct ril_network_priv *priv = self->priv;
 	const enum ofono_radio_access_mode pref_mode = self->pref_mode;

+	/* This request never fails because in case of error it gets retried */
+	GASSERT(status == RIL_E_SUCCESS);
 	GASSERT(priv->query_rat_id);
-	priv->query_rat_id = 0;

-	if (status == RIL_E_SUCCESS) {
-		priv->rat = ril_network_parse_pref_resp(data, len);
-		self->pref_mode = ril_network_rat_to_mode(priv->rat);
-		DBG_(self, "rat mode %d (%s)", priv->rat,
+	priv->query_rat_id = 0;
+	priv->rat = ril_network_parse_pref_resp(data, len);
+	self->pref_mode = ril_network_rat_to_mode(priv->rat);
+	DBG_(self, "rat mode %d (%s)", priv->rat,
 			ofono_radio_access_mode_to_string(self->pref_mode));

-		if (self->pref_mode != pref_mode) {
-			ril_network_emit(self, SIGNAL_PREF_MODE_CHANGED);
-		}
+	if (self->pref_mode != pref_mode) {
+		ril_network_emit(self, SIGNAL_PREF_MODE_CHANGED);
+	}

-		if (ril_network_can_set_pref_mode(self)) {
-			ril_network_check_pref_mode(self, FALSE);
-		}
+	if (ril_network_can_set_pref_mode(self)) {
+		ril_network_check_pref_mode(self, FALSE);
 	}
 }

@@ -1078,7 +1023,6 @@ static void ril_network_query_pref_mode(struct ril_network *self)
 	GRilIoRequest *req = grilio_request_new();

 	grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
-	grilio_request_set_retry_func(req, ril_network_retry);
 	grilio_queue_cancel_request(priv->q, priv->query_rat_id, FALSE);
 	priv->query_rat_id = grilio_queue_send_request_full(priv->q, req,
 				RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE,
@@ -1095,79 +1039,19 @@ void ril_network_set_max_pref_mode(struct ril_network *self,
 			DBG_(self, "rat mode %d (%s)", max_mode,
 				ofono_radio_access_mode_to_string(max_mode));
 			self->max_pref_mode = max_mode;
+			ril_network_emit(self, SIGNAL_MAX_PREF_MODE_CHANGED);
 			ril_network_check_initial_attach_apn(self);
 		}
 		ril_network_check_pref_mode(self, TRUE);
 	}
 }

-static void ril_network_supported_modes_handler(struct ril_radio_caps *caps,
-							void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-
-	DBG_(self, "%s", ofono_radio_access_mode_to_string
-						(caps->supported_modes));
-	ril_network_check_pref_mode(self, TRUE);
-}
-
-static void ril_network_radio_capability_tx_done_cb
-		(struct ril_radio_caps_manager *mgr, void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-
-	DBG_(self, "");
-	ril_network_assert_pref_mode(self);
-}
-
-static void ril_network_release_radio_caps(struct ril_network *self)
-{
-	struct ril_network_priv *priv = self->priv;
-	struct ril_radio_caps *caps = priv->caps;
-
-	if (caps) {
-		ril_radio_caps_manager_remove_all_handlers(caps->mgr,
-					priv->caps_mgr_event_id);
-		ril_radio_caps_remove_handler(caps,
-					priv->supported_modes_event_id);
-		ril_radio_caps_unref(caps);
-
-		priv->caps = NULL;
-		priv->supported_modes_event_id = 0;
-	}
-}
-
-static void ril_network_attach_radio_caps(struct ril_network *self,
-						struct ril_radio_caps *caps)
+void ril_network_assert_pref_mode(struct ril_network *self, gboolean immediate)
 {
 	struct ril_network_priv *priv = self->priv;

-	priv->caps = ril_radio_caps_ref(caps);
-	priv->supported_modes_event_id =
-		ril_radio_caps_add_supported_modes_handler(caps,
-			ril_network_supported_modes_handler, self);
-	priv->caps_mgr_event_id[RADIO_CAPS_MGR_TX_DONE] =
-		ril_radio_caps_manager_add_tx_done_handler(caps->mgr,
-			ril_network_radio_capability_tx_done_cb, self);
-	priv->caps_mgr_event_id[RADIO_CAPS_MGR_TX_ABORTED] =
-		ril_radio_caps_manager_add_tx_aborted_handler(caps->mgr,
-			ril_network_radio_capability_tx_done_cb, self);
-}
-
-void ril_network_set_radio_caps(struct ril_network *self,
-						struct ril_radio_caps *caps)
-{
-	if (self) {
-		struct ril_network_priv *priv = self->priv;
-
-		if (priv->caps != caps) {
-			ril_network_release_radio_caps(self);
-			if (caps) {
-				ril_network_attach_radio_caps(self, caps);
-			}
-			ril_network_check_pref_mode(self, TRUE);
-		}
-	}
+	priv->assert_rat = TRUE;
+	ril_network_check_pref_mode(self, immediate);
 }

 gulong ril_network_add_operator_changed_handler(struct ril_network *self,
@@ -1198,6 +1082,13 @@ gulong ril_network_add_pref_mode_changed_handler(struct ril_network *self,
 		SIGNAL_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
 }

+gulong ril_network_add_max_pref_mode_changed_handler(struct ril_network *self,
+					ril_network_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_MAX_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
 void ril_network_remove_handler(struct ril_network *self, gulong id)
 {
 	if (G_LIKELY(self) && G_LIKELY(id)) {
@@ -1220,6 +1111,16 @@ static void ril_network_state_changed_cb(GRilIoChannel *io, guint code,
 	ril_network_poll_state(self);
 }

+static void ril_network_radio_capability_changed_cb(GRilIoChannel *io,
+		guint code, const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+
+	DBG_(self, "");
+	GASSERT(code == RIL_UNSOL_RADIO_CAPABILITY);
+	ril_network_assert_pref_mode(self, FALSE);
+}
+
 static void ril_network_radio_state_cb(struct ril_radio *radio, void *data)
 {
 	struct ril_network *self = RIL_NETWORK(data);
@@ -1352,6 +1253,10 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 		grilio_channel_add_unsol_event_handler(priv->io,
 			ril_network_state_changed_cb,
 			RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, self);
+	priv->unsol_event_id[UNSOL_EVENT_RADIO_CAPABILITY] =
+		grilio_channel_add_unsol_event_handler(priv->io,
+			ril_network_radio_capability_changed_cb,
+			RIL_UNSOL_RADIO_CAPABILITY, self);

 	priv->radio_event_id[RADIO_EVENT_STATE_CHANGED] =
 		ril_radio_add_state_changed_handler(priv->radio,
@@ -1446,7 +1351,6 @@ static void ril_network_finalize(GObject *object)
 	grilio_channel_remove_all_handlers(priv->io, priv->unsol_event_id);
 	grilio_channel_unref(priv->io);
 	grilio_queue_unref(priv->q);
-	ril_network_release_radio_caps(self);
 	ril_radio_remove_all_handlers(priv->radio, priv->radio_event_id);
 	ril_radio_unref(priv->radio);
 	ril_sim_card_remove_all_handlers(priv->simcard, priv->simcard_event_id);
@@ -1468,6 +1372,7 @@ static void ril_network_class_init(RilNetworkClass *klass)
 	RIL_NETWORK_SIGNAL(klass, VOICE_STATE);
 	RIL_NETWORK_SIGNAL(klass, DATA_STATE);
 	RIL_NETWORK_SIGNAL(klass, PREF_MODE);
+	RIL_NETWORK_SIGNAL(klass, MAX_PREF_MODE);
 }

 /*
--- a/ofono/drivers/ril/ril_network.h
+++ b/ofono/drivers/ril/ril_network.h
@@ -1,8 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -22,7 +21,6 @@
 #include <glib-object.h>

 struct ofono_network_operator;
-struct ril_radio_caps;

 struct ril_registration_state {
 	int status;        /* enum network_registration_status */
@@ -44,6 +42,7 @@ struct ril_network {
 	struct ril_sim_settings *settings;
 };

+struct ofono_sim;
 typedef void (*ril_network_cb_t)(struct ril_network *net, void *arg);

 struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
@@ -55,13 +54,10 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 struct ril_network *ril_network_ref(struct ril_network *net);
 void ril_network_unref(struct ril_network *net);

-void ril_network_set_radio_caps(struct ril_network *net,
-				struct ril_radio_caps *caps);
 void ril_network_set_max_pref_mode(struct ril_network *net,
 				enum ofono_radio_access_mode max_pref_mode,
 				gboolean force_check);
-enum ofono_radio_access_mode ril_network_max_supported_mode
-						(struct ril_network *self);
+void ril_network_assert_pref_mode(struct ril_network *net, gboolean immediate);
 void ril_network_query_registration_state(struct ril_network *net);
 gulong ril_network_add_operator_changed_handler(struct ril_network *net,
 					ril_network_cb_t cb, void *arg);
@@ -71,6 +67,8 @@ gulong ril_network_add_data_state_changed_handler(struct ril_network *net,
 					ril_network_cb_t cb, void *arg);
 gulong ril_network_add_pref_mode_changed_handler(struct ril_network *net,
 					ril_network_cb_t cb, void *arg);
+gulong ril_network_add_max_pref_mode_changed_handler(struct ril_network *net,
+					ril_network_cb_t cb, void *arg);
 void ril_network_remove_handler(struct ril_network *net, gulong id);
 void ril_network_remove_handlers(struct ril_network *net, gulong *ids, int n);

--- a/ofono/drivers/ril/ril_oem_raw.c
+++ b/ofono/drivers/ril/ril_oem_raw.c
@@ -1,8 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -33,11 +32,6 @@ struct ril_oem_raw {

 #define DBG_(oem,fmt,args...) DBG("%s" fmt, (oem)->log_prefix, ##args)

-static void ril_oem_raw_send_done(void *msg)
-{
-	dbus_message_unref(msg);
-}
-
 static void ril_oem_raw_send_cb(GRilIoChannel *io, int ril_status,
 			const void *data, guint len, void *user_data)
 {
@@ -46,13 +40,20 @@ static void ril_oem_raw_send_cb(GRilIoChannel *io, int ril_status,

 	if (ril_status == RIL_E_SUCCESS) {
 		DBusMessageIter it, array;
+		const guchar* bytes = data;
+		guint i;

 		reply = dbus_message_new_method_return(msg);
 		dbus_message_iter_init_append(reply, &it);
 		dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY,
 					DBUS_TYPE_BYTE_AS_STRING, &array);
-		dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
-					&data, len);
+
+		for (i = 0; i < len; i++) {
+			guchar byte = bytes[i];
+			dbus_message_iter_append_basic(&array, DBUS_TYPE_BYTE,
+									&byte);
+		}
+
 		dbus_message_iter_close_container(&it, &array);
 	} else if (ril_status == GRILIO_STATUS_TIMEOUT) {
 		DBG("Timed out");
@@ -62,7 +63,7 @@ static void ril_oem_raw_send_cb(GRilIoChannel *io, int ril_status,
 		reply = __ofono_error_failed(msg);
 	}

-	g_dbus_send_message(ofono_dbus_get_connection(), reply);
+	__ofono_dbus_pending_reply(&msg, reply);
 }

 static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
@@ -71,12 +72,6 @@ static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
 	DBusMessageIter it;
 	struct ril_oem_raw *oem = user_data;

-	if (!__ofono_dbus_access_method_allowed(dbus_message_get_sender(msg),
-					OFONO_DBUS_ACCESS_INTF_OEMRAW,
-					OFONO_DBUS_ACCESS_OEMRAW_SEND, NULL)) {
-		return __ofono_error_access_denied(msg);
-	}
-
 	dbus_message_iter_init(msg, &it);
 	if (dbus_message_iter_get_arg_type(&it) == DBUS_TYPE_ARRAY &&
 		dbus_message_iter_get_element_type(&it) == DBUS_TYPE_BYTE) {
@@ -99,7 +94,7 @@ static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
 		grilio_request_append_bytes(req, data, data_len);
 		grilio_queue_send_request_full(oem->q, req,
 				RIL_REQUEST_OEM_HOOK_RAW, ril_oem_raw_send_cb,
-				ril_oem_raw_send_done, dbus_message_ref(msg));
+				NULL, dbus_message_ref(msg));
 		grilio_request_unref(req);
 		return NULL;
 	} else {
--- a/ofono/drivers/ril/ril_phonebook.c
+++ b/ofono/drivers/ril/ril_phonebook.c
@@ -998,9 +998,8 @@ static void ril_export_entries(struct ofono_phonebook *pb,
 	pbd->df_path = usim_path;
 	pbd->df_size = sizeof(usim_path);

-	ofono_sim_read_path(pbd->sim_context, SIM_EFPBR_FILEID,
+	ofono_sim_read(pbd->sim_context, SIM_EFPBR_FILEID,
 			OFONO_SIM_FILE_STRUCTURE_FIXED,
-			pbd->df_path, pbd->df_size,
 			pb_reference_data_cb, pb);
 }

--- a/ofono/drivers/ril/ril_plugin.c
+++ b/ofono/drivers/ril/ril_plugin.c
@@ -73,7 +73,6 @@
 #define RILMODEM_DEFAULT_LTE_MODE   PREF_NET_TYPE_LTE_GSM_WCDMA
 #define RILMODEM_DEFAULT_UMTS_MODE  PREF_NET_TYPE_GSM_WCDMA_AUTO
 #define RILMODEM_DEFAULT_NETWORK_MODE_TIMEOUT (20*1000) /* ms */
-#define RILMODEM_DEFAULT_NETWORK_SELECTION_TIMEOUT (100*1000) /* ms */
 #define RILMODEM_DEFAULT_DBM_WEAK   (-100) /* very weak, 0.0000000001 mW */
 #define RILMODEM_DEFAULT_DBM_STRONG (-60)  /* strong signal, 0.000001 mW */
 #define RILMODEM_DEFAULT_ENABLE_VOICECALL TRUE
@@ -94,14 +93,11 @@
 #define RILMODEM_DEFAULT_LEGACY_IMEI_QUERY FALSE
 #define RILMODEM_DEFAULT_RADIO_POWER_CYCLE TRUE
 #define RILMODEM_DEFAULT_CONFIRM_RADIO_POWER_ON TRUE
-#define RILMODEM_DEFAULT_REPLACE_STRANGE_OPER FALSE
 #define RILMODEM_DEFAULT_NETWORK_SELECTION_MANUAL_0 TRUE
 #define RILMODEM_DEFAULT_FORCE_GSM_WHEN_RADIO_OFF TRUE
 #define RILMODEM_DEFAULT_USE_DATA_PROFILES FALSE
 #define RILMODEM_DEFAULT_MMS_DATA_PROFILE_ID RIL_DATA_PROFILE_IMS
 #define RILMODEM_DEFAULT_SLOT_FLAGS SAILFISH_SLOT_NO_FLAGS
-#define RILMODEM_DEFAULT_CELL_INFO_INTERVAL_SHORT_MS (2000) /* 2 sec */
-#define RILMODEM_DEFAULT_CELL_INFO_INTERVAL_LONG_MS  (30000) /* 30 sec */

 /* RIL socket transport name and parameters */
 #define RIL_TRANSPORT_MODEM                 "modem"
@@ -138,7 +134,6 @@
 #define RILCONF_LTE_MODE                    "lteNetworkMode"
 #define RILCONF_UMTS_MODE                   "umtsNetworkMode"
 #define RILCONF_NETWORK_MODE_TIMEOUT        "networkModeTimeout"
-#define RILCONF_NETWORK_SELECTION_TIMEOUT   "networkSelectionTimeout"
 #define RILCONF_SIGNAL_STRENGTH_RANGE       "signalStrengthRange"
 #define RILCONF_UICC_WORKAROUND             "uiccWorkaround"
 #define RILCONF_ECCLIST_FILE                "ecclistFile"
@@ -154,14 +149,11 @@
 #define RILCONF_RADIO_POWER_CYCLE           "radioPowerCycle"
 #define RILCONF_CONFIRM_RADIO_POWER_ON      "confirmRadioPowerOn"
 #define RILCONF_SINGLE_DATA_CONTEXT         "singleDataContext"
-#define RILCONF_REPLACE_STRANGE_OPER        "replaceStrangeOperatorNames"
 #define RILCONF_NETWORK_SELECTION_MANUAL_0  "networkSelectionManual0"
 #define RILCONF_FORCE_GSM_WHEN_RADIO_OFF    "forceGsmWhenRadioOff"
 #define RILCONF_USE_DATA_PROFILES           "useDataProfiles"
 #define RILCONF_MMS_DATA_PROFILE_ID         "mmsDataProfileId"
 #define RILCONF_DEVMON                      "deviceStateTracking"
-#define RILCONF_CELL_INFO_INTERVAL_SHORT_MS "cellInfoIntervalShortMs"
-#define RILCONF_CELL_INFO_INTERVAL_LONG_MS  "cellInfoIntervalLongMs"

 /* Modem error ids */
 #define RIL_ERROR_ID_RILD_RESTART           "rild-restart"
@@ -187,9 +179,10 @@ enum ril_set_radio_cap_opt {
 };

 enum ril_devmon_opt {
-	RIL_DEVMON_SS = 0x01,
-	RIL_DEVMON_DS = 0x02,
-	RIL_DEVMON_UR = 0x04
+	RIL_DEVMON_NONE,
+	RIL_DEVMON_AUTO,
+	RIL_DEVMON_SS,
+	RIL_DEVMON_DS
 };

 struct ril_plugin_identity {
@@ -234,7 +227,6 @@ typedef struct sailfish_slot_impl {
 	struct ril_modem *modem;
 	struct ril_radio *radio;
 	struct ril_radio_caps *caps;
-	struct ril_radio_caps_request *caps_req;
 	struct ril_network *network;
 	struct ril_sim_card *sim_card;
 	struct ril_sim_settings *sim_settings;
@@ -371,7 +363,6 @@ static void ril_plugin_remove_slot_handler(ril_slot *slot, int id)
 static void ril_plugin_shutdown_slot(ril_slot *slot, gboolean kill_io)
 {
 	if (slot->modem) {
-		ril_data_allow(slot->data, RIL_DATA_ROLE_NONE);
 		ril_modem_delete(slot->modem);
 		/* The above call is expected to result in
 		 * ril_plugin_modem_removed getting called
@@ -391,16 +382,12 @@ static void ril_plugin_shutdown_slot(ril_slot *slot, gboolean kill_io)
 		}

 		if (slot->cell_info) {
-			sailfish_manager_set_cell_info(slot->handle, NULL);
 			sailfish_cell_info_unref(slot->cell_info);
 			slot->cell_info = NULL;
 		}

 		if (slot->caps) {
-			ril_network_set_radio_caps(slot->network, NULL);
-			ril_radio_caps_request_free(slot->caps_req);
-			ril_radio_caps_drop(slot->caps);
-			slot->caps_req = NULL;
+			ril_radio_caps_unref(slot->caps);
 			slot->caps = NULL;
 		}

@@ -914,7 +901,7 @@ static void ril_plugin_radio_caps_cb(const struct ril_radio_capability *cap,
 			plugin->caps_manager = ril_radio_caps_manager_new
 				(plugin->data_manager);
 			plugin->caps_manager_event_id =
-				ril_radio_caps_manager_add_tx_aborted_handler(
+				ril_radio_caps_manager_add_aborted_handler(
 					plugin->caps_manager,
 					ril_plugin_caps_switch_aborted,
 					plugin);
@@ -922,10 +909,9 @@ static void ril_plugin_radio_caps_cb(const struct ril_radio_capability *cap,

 		GASSERT(!slot->caps);
 		slot->caps = ril_radio_caps_new(plugin->caps_manager,
-			ril_plugin_log_prefix(slot), slot->io, slot->watch,
-			slot->data, slot->radio, slot->sim_card,
-			slot->sim_settings, &slot->config, cap);
-		ril_network_set_radio_caps(slot->network, slot->caps);
+			ril_plugin_log_prefix(slot), slot->io, slot->data,
+			slot->radio, slot->sim_card, slot->network,
+			&slot->config, cap);
 	}
 }

@@ -1053,13 +1039,13 @@ static void ril_plugin_slot_connected(ril_slot *slot)
 				slot->path, slot->config.techs, slot->imei,
 				slot->imeisv, ril_plugin_sim_state(slot),
 				slot->slot_flags);
+		sailfish_manager_set_cell_info(slot->handle, slot->cell_info);
 		grilio_channel_set_enabled(slot->io, slot->handle->enabled);

 		/* Check if this was the last slot we were waiting for */
 		ril_plugin_check_if_started(plugin);
 	}

-	sailfish_manager_set_cell_info(slot->handle, slot->cell_info);
 	ril_plugin_check_modem(slot);
 	ril_plugin_check_ready(slot);
 }
@@ -1075,11 +1061,8 @@ static void ril_plugin_slot_connected_cb(GRilIoChannel *io, void *user_data)
 static void ril_plugin_init_io(ril_slot *slot)
 {
 	if (!slot->io) {
-		struct grilio_transport *transport =
-			ofono_ril_transport_connect(slot->transport_name,
-						slot->transport_params);
-
-		slot->io = grilio_channel_new(transport);
+		slot->io = grilio_channel_new(ofono_ril_transport_connect
+			(slot->transport_name, slot->transport_params));
 		if (slot->io) {
 			ril_debug_trace_update(slot);
 			ril_debug_dump_update(slot);
@@ -1111,7 +1094,6 @@ static void ril_plugin_init_io(ril_slot *slot)
 						slot);
 			}
 		}
-		grilio_transport_unref(transport);
 	}

 	if (!slot->io) {
@@ -1157,8 +1139,6 @@ static void ril_plugin_slot_modem_changed(struct ofono_watch *w,

 		slot->modem = NULL;
 		ril_data_allow(slot->data, RIL_DATA_ROLE_NONE);
-		ril_radio_caps_request_free(slot->caps_req);
-		slot->caps_req = NULL;
 	}
 }

@@ -1214,8 +1194,6 @@ static ril_slot *ril_plugin_slot_new_take(char *transport,
 	config->lte_network_mode = RILMODEM_DEFAULT_LTE_MODE;
 	config->umts_network_mode = RILMODEM_DEFAULT_UMTS_MODE;
 	config->network_mode_timeout = RILMODEM_DEFAULT_NETWORK_MODE_TIMEOUT;
-	config->network_selection_timeout =
-		RILMODEM_DEFAULT_NETWORK_SELECTION_TIMEOUT;
 	config->signal_strength_dbm_weak = RILMODEM_DEFAULT_DBM_WEAK;
 	config->signal_strength_dbm_strong = RILMODEM_DEFAULT_DBM_STRONG;
 	config->empty_pin_query = RILMODEM_DEFAULT_EMPTY_PIN_QUERY;
@@ -1227,17 +1205,12 @@ static ril_slot *ril_plugin_slot_new_take(char *transport,
 	config->enable_stk = RILMODEM_DEFAULT_ENABLE_STK;
 	config->query_available_band_mode =
 		RILMODEM_DEFAULT_QUERY_AVAILABLE_BAND_MODE;
-	config->replace_strange_oper = RILMODEM_DEFAULT_REPLACE_STRANGE_OPER;
 	config->network_selection_manual_0 =
 		RILMODEM_DEFAULT_NETWORK_SELECTION_MANUAL_0;
 	config->force_gsm_when_radio_off =
 		RILMODEM_DEFAULT_FORCE_GSM_WHEN_RADIO_OFF;
 	config->use_data_profiles = RILMODEM_DEFAULT_USE_DATA_PROFILES;
 	config->mms_data_profile_id = RILMODEM_DEFAULT_MMS_DATA_PROFILE_ID;
-	config->cell_info_interval_short_ms =
-				RILMODEM_DEFAULT_CELL_INFO_INTERVAL_SHORT_MS;
-	config->cell_info_interval_long_ms =
-				RILMODEM_DEFAULT_CELL_INFO_INTERVAL_LONG_MS;
 	slot->timeout = RILMODEM_DEFAULT_TIMEOUT;
 	slot->sim_flags = RILMODEM_DEFAULT_SIM_FLAGS;
 	slot->slot_flags = RILMODEM_DEFAULT_SLOT_FLAGS;
@@ -1249,7 +1222,8 @@ static ril_slot *ril_plugin_slot_new_take(char *transport,
 		RILMODEM_DEFAULT_DATA_CALL_RETRY_LIMIT;
 	slot->data_opt.data_call_retry_delay_ms =
 		RILMODEM_DEFAULT_DATA_CALL_RETRY_DELAY;
-	slot->devmon = ril_devmon_auto_new(config);
+
+	slot->devmon = ril_devmon_auto_new();
 	slot->watch = ofono_watch_new(dbus_path);
 	slot->watch_event_id[WATCH_EVENT_MODEM] =
 		ofono_watch_add_modem_changed_handler(slot->watch,
@@ -1271,7 +1245,6 @@ static void ril_plugin_slot_apply_vendor_defaults(ril_slot *slot)
 		defaults.empty_pin_query = config->empty_pin_query;
 		defaults.mms_data_profile_id = config->mms_data_profile_id;
 		defaults.use_data_profiles = config->use_data_profiles;
-		defaults.replace_strange_oper = config->replace_strange_oper;
 		defaults.force_gsm_when_radio_off =
 			config->force_gsm_when_radio_off;
 		defaults.query_available_band_mode =
@@ -1284,7 +1257,6 @@ static void ril_plugin_slot_apply_vendor_defaults(ril_slot *slot)
 		config->empty_pin_query = defaults.empty_pin_query;
 		config->use_data_profiles = defaults.use_data_profiles;
 		config->mms_data_profile_id = defaults.mms_data_profile_id;
-		config->replace_strange_oper = defaults.replace_strange_oper;
 		config->force_gsm_when_radio_off =
 			defaults.force_gsm_when_radio_off;
 		config->query_available_band_mode =
@@ -1508,14 +1480,6 @@ static ril_slot *ril_plugin_parse_config_group(GKeyFile *file,
 				config->enable_stk ? "yes" : "no");
 	}

-	/* replaceStrangeOperatorNames */
-	if (ril_config_get_boolean(file, group,
-					RILCONF_REPLACE_STRANGE_OPER,
-					&config->replace_strange_oper)) {
-		DBG("%s: " RILCONF_REPLACE_STRANGE_OPER " %s", group,
-			config->replace_strange_oper ? "yes" : "no");
-	}
-
 	/* networkSelectionManual0 */
 	if (ril_config_get_boolean(file, group,
 					RILCONF_NETWORK_SELECTION_MANUAL_0,
@@ -1602,14 +1566,6 @@ static ril_slot *ril_plugin_parse_config_group(GKeyFile *file,
 					config->network_mode_timeout);
 	}

-	/* networkSelectionTimeout */
-	if (ril_config_get_integer(file, group,
-				RILCONF_NETWORK_SELECTION_TIMEOUT,
-				&config->network_selection_timeout)) {
-		DBG("%s: " RILCONF_NETWORK_SELECTION_TIMEOUT " %d", group,
-				config->network_selection_timeout);
-	}
-
 	/* signalStrengthRange */
 	ints = ril_config_get_ints(file, group, RILCONF_SIGNAL_STRENGTH_RANGE);
 	if (gutil_ints_get_count(ints) == 2) {
@@ -1749,59 +1705,24 @@ static ril_slot *ril_plugin_parse_config_group(GKeyFile *file,
 				slot->legacy_imei_query ? "on" : "off");
 	}

-	/* cellInfoIntervalShortMs */
-	if (ril_config_get_integer(file, group,
-				RILCONF_CELL_INFO_INTERVAL_SHORT_MS,
-				&config->cell_info_interval_short_ms)) {
-		DBG("%s: " RILCONF_CELL_INFO_INTERVAL_SHORT_MS " %d", group,
-					config->cell_info_interval_short_ms);
-	}
-
-	/* cellInfoIntervalLongMs */
-	if (ril_config_get_integer(file, group,
-				RILCONF_CELL_INFO_INTERVAL_LONG_MS,
-				&config->cell_info_interval_long_ms)) {
-		DBG("%s: " RILCONF_CELL_INFO_INTERVAL_LONG_MS " %d",
-				group, config->cell_info_interval_long_ms);
-	}
-
-	/* Replace devmon with a new one with applied settings */
-	ril_devmon_free(slot->devmon);
-	slot->devmon = NULL;
-
 	/* deviceStateTracking */
-	if (ril_config_get_mask(file, group, RILCONF_DEVMON, &ival,
+	if (ril_config_get_enum(file, group, RILCONF_DEVMON, &ival,
+				"none", RIL_DEVMON_NONE,
+				"auto", RIL_DEVMON_AUTO,
 				"ds", RIL_DEVMON_DS,
-				"ss", RIL_DEVMON_SS,
-				"ur", RIL_DEVMON_UR, NULL) && ival) {
-		int n = 0;
-		struct ril_devmon *devmon[3];
-
-		if (ival & RIL_DEVMON_DS) {
-			devmon[n++] = ril_devmon_ds_new(config);
-		}
-		if (ival & RIL_DEVMON_SS) {
-			devmon[n++] = ril_devmon_ss_new(config);
-		}
-		if (ival & RIL_DEVMON_UR) {
-			devmon[n++] = ril_devmon_ur_new(config);
-		}
-		DBG("%s: " RILCONF_DEVMON " 0x%x", group, ival);
-		slot->devmon = ril_devmon_combine(devmon, n);
-	} else {
-		/* Try special values */
-		sval = ril_config_get_string(file, group, RILCONF_DEVMON);
-		if (sval) {
-			if (!g_ascii_strcasecmp(sval, "none")) {
-				DBG("%s: " RILCONF_DEVMON " %s", group, sval);
-			} else if (!g_ascii_strcasecmp(sval, "auto")) {
-				DBG("%s: " RILCONF_DEVMON " %s", group, sval);
-				slot->devmon = ril_devmon_auto_new(config);
-			}
-			g_free(sval);
-		} else {
-			/* This is the default */
-			slot->devmon = ril_devmon_auto_new(config);
+				"ss", RIL_DEVMON_SS, NULL)) {
+		DBG("%s: " RILCONF_DEVMON " %s", group,
+				ival == RIL_DEVMON_NONE ? "off" :
+				ival == RIL_DEVMON_DS ? "on" :
+				ival == RIL_DEVMON_SS ? "legacy" :
+				"auto");
+		if (ival != RIL_DEVMON_AUTO) {
+			/* Default is automatic, reallocate the object */
+			ril_devmon_free(slot->devmon);
+			slot->devmon =
+				(ival == RIL_DEVMON_DS ? ril_devmon_ds_new() :
+				 ival == RIL_DEVMON_SS ? ril_devmon_ss_new() :
+				 NULL);
 		}
 	}

@@ -2232,24 +2153,10 @@ static void ril_plugin_manager_free(ril_plugin *plugin)

 static void ril_slot_set_data_role(ril_slot *slot, enum sailfish_data_role r)
 {
-	enum ril_data_role role =
+	ril_data_allow(slot->data,
 		(r == SAILFISH_DATA_ROLE_INTERNET) ? RIL_DATA_ROLE_INTERNET :
 		(r == SAILFISH_DATA_ROLE_MMS) ? RIL_DATA_ROLE_MMS :
-		RIL_DATA_ROLE_NONE;
-	ril_data_allow(slot->data, role);
-	ril_radio_caps_request_free(slot->caps_req);
-	if (role == RIL_DATA_ROLE_NONE) {
-		slot->caps_req = NULL;
-	} else {
-		const enum ofono_radio_access_mode mode =
-			(r == SAILFISH_DATA_ROLE_MMS) ?
-				OFONO_RADIO_ACCESS_MODE_GSM :
-				__ofono_radio_access_max_mode
-						(slot->sim_settings->techs);
-
-		slot->caps_req = ril_radio_caps_request_new
-			(slot->caps, mode, role);
-	}
+		RIL_DATA_ROLE_NONE);
 }

 static void ril_slot_enabled_changed(struct sailfish_slot_impl *s)
@@ -2369,6 +2276,7 @@ static int ril_plugin_init(void)
 static void ril_plugin_exit(void)
 {
 	DBG("");
+	GASSERT(ril_driver);

 	ofono_ril_transport_unregister(&ril_socket_transport);
 	ofono_modem_driver_unregister(&ril_modem_driver);
--- a/ofono/drivers/ril/ril_radio.c
+++ b/ofono/drivers/ril/ril_radio.c
@@ -241,19 +241,7 @@ static void ril_radio_power_request(struct ril_radio *self, gboolean on,
 void ril_radio_confirm_power_on(struct ril_radio *self)
 {
 	if (G_LIKELY(self) && ril_radio_power_should_be_on(self)) {
-		struct ril_radio_priv *priv = self->priv;
-
-		if (priv->pending_id) {
-			if (!priv->next_state) {
-				/* Wait for the pending request to complete */
-				priv->next_state_valid = TRUE;
-				priv->next_state = TRUE;
-				DBG_(self, "on (queued)");
-			}
-		} else {
-			DBG_(self, "on");
-			ril_radio_submit_power_request(self, TRUE);
-		}
+		ril_radio_power_request(self, TRUE, TRUE);
 	}
 }

--- a/ofono/drivers/ril/ril_radio_caps.c
+++ b/ofono/drivers/ril/ril_radio_caps.c
--- a/ofono/drivers/ril/ril_radio_caps.h
+++ b/ofono/drivers/ril/ril_radio_caps.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2017-2020 Jolla Ltd.
+ *  Copyright (C) 2017 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -19,16 +19,12 @@
 #include "ril_types.h"

 struct ril_data_manager;
-struct ril_sim_settings;
 struct ril_radio_caps;
 struct ril_radio_caps_manager;
 struct ril_radio_capability;
-struct ril_radio_caps_request;

-typedef void (*ril_radio_caps_cb_t)(struct ril_radio_caps *caps, void *arg);
 typedef void (*ril_radio_caps_manager_cb_t)(struct ril_radio_caps_manager *mgr,
 							void *user_data);
-
 /* ril_radio_capability pointer is NULL if functionality is unsupported */
 typedef void (*ril_radio_caps_check_cb_t)
 		(const struct ril_radio_capability *cap, void *user_data);
@@ -43,47 +39,21 @@ struct ril_radio_caps_manager *ril_radio_caps_manager_new
 struct ril_radio_caps_manager *ril_radio_caps_manager_ref
 					(struct ril_radio_caps_manager *mgr);
 void ril_radio_caps_manager_unref(struct ril_radio_caps_manager *mgr);
-gulong ril_radio_caps_manager_add_tx_aborted_handler
-				(struct ril_radio_caps_manager *mgr,
-				ril_radio_caps_manager_cb_t cb, void *arg);
-gulong ril_radio_caps_manager_add_tx_done_handler
+gulong ril_radio_caps_manager_add_aborted_handler
 				(struct ril_radio_caps_manager *mgr,
 				ril_radio_caps_manager_cb_t cb, void *arg);
 void ril_radio_caps_manager_remove_handler(struct ril_radio_caps_manager *mgr,
-						gulong id);
-void ril_radio_caps_manager_remove_handlers(struct ril_radio_caps_manager *mgr,
-						gulong *ids, int count);
-#define ril_radio_caps_manager_remove_all_handlers(mgr, ids) \
-	ril_radio_caps_manager_remove_handlers(mgr, ids, G_N_ELEMENTS(ids))
+								gulong id);

 /* And one ril_radio_caps object per modem */
-
-struct ril_radio_caps {
-	struct ril_radio_caps_manager *mgr;
-	enum ofono_radio_access_mode supported_modes;
-};
-
 struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
 		const char *log_prefix, GRilIoChannel *io,
-		struct ofono_watch *watch,
 		struct ril_data *data, struct ril_radio *radio,
-		struct ril_sim_card *sim, struct ril_sim_settings *settings,
+		struct ril_sim_card *sim, struct ril_network *net,
 		const struct ril_slot_config *config,
 		const struct ril_radio_capability *cap);
 struct ril_radio_caps *ril_radio_caps_ref(struct ril_radio_caps *caps);
 void ril_radio_caps_unref(struct ril_radio_caps *caps);
-void ril_radio_caps_drop(struct ril_radio_caps *caps);
-gulong ril_radio_caps_add_supported_modes_handler
-				(struct ril_radio_caps *caps,
-					ril_radio_caps_cb_t cb, void *arg);
-void ril_radio_caps_remove_handler(struct ril_radio_caps *caps, gulong id);
-
-/* Data requests */
-
-struct ril_radio_caps_request *ril_radio_caps_request_new
-		(struct ril_radio_caps *caps, enum ofono_radio_access_mode mode,
-						enum ril_data_role role);
-void ril_radio_caps_request_free(struct ril_radio_caps_request *req);

 #endif /* RIL_RADIO_CAPS_H */

--- a/ofono/drivers/ril/ril_sim.c
+++ b/ofono/drivers/ril/ril_sim.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -20,8 +20,6 @@

 #include <ofono/watch.h>

-#include <gutil_misc.h>
-
 #include "simutil.h"
 #include "util.h"
 #include "ofono.h"
@@ -88,7 +86,6 @@ struct ril_sim {
 	gboolean empty_pin_query_allowed;
 	gboolean inserted;
 	guint idle_id; /* Used by register and SIM reset callbacks */
-	guint list_apps_id;
 	gulong card_event_id[SIM_CARD_EVENT_COUNT];
 	gulong io_event_id[IO_EVENT_COUNT];
 	guint query_pin_retries_id;
@@ -121,25 +118,12 @@ struct ril_sim_cbd_io {
 		ofono_sim_write_cb_t write;
 		ofono_sim_imsi_cb_t imsi;
 		ofono_query_facility_lock_cb_t query_facility_lock;
-		ofono_sim_open_channel_cb_t open_channel;
-		ofono_sim_close_channel_cb_t close_channel;
 		gpointer ptr;
 	} cb;
 	gpointer data;
 	guint req_id;
 };

-struct ril_sim_session_cbd {
-	struct ril_sim *sd;
-	struct ril_sim_card *card;
-	ofono_sim_logical_access_cb_t cb;
-	gpointer data;
-	int ref_count;
-	int session_id;
-	int cla;
-	guint req_id;
-};
-
 struct ril_sim_pin_cbd {
 	struct ril_sim *sd;
 	ofono_sim_lock_unlock_cb_t cb;
@@ -166,16 +150,6 @@ struct ril_sim_retry_query {
 	GRilIoRequest *(*new_req)(struct ril_sim *sd);
 };

-/* TS 102.221 */
-#define APP_TEMPLATE_TAG 0x61
-#define APP_ID_TAG 0x4F
-
-struct ril_sim_list_apps {
-	struct ril_sim *sd;
-	ofono_sim_list_apps_cb_t cb;
-	void *data;
-};
-
 static GRilIoRequest *ril_sim_empty_sim_pin_req(struct ril_sim *sd);
 static GRilIoRequest *ril_sim_empty_sim_puk_req(struct ril_sim *sd);
 static void ril_sim_query_retry_count_cb(GRilIoChannel *io, int status,
@@ -244,45 +218,6 @@ static void ril_sim_cbd_io_start(struct ril_sim_cbd_io *cbd, GRilIoRequest* req,
 	ril_sim_card_sim_io_started(cbd->card, cbd->req_id);
 }

-static struct ril_sim_session_cbd *ril_sim_session_cbd_new(struct ril_sim *sd,
-	int session_id, int cla, ofono_sim_logical_access_cb_t cb, void *data)
-{
-	struct ril_sim_session_cbd *cbd = g_new0(struct ril_sim_session_cbd, 1);
-
-	cbd->sd = sd;
-	cbd->cb = cb;
-	cbd->data = data;
-	cbd->card = ril_sim_card_ref(sd->card);
-	cbd->session_id = session_id;
-	cbd->cla = cla;
-	cbd->ref_count = 1;
-	return cbd;
-}
-
-static void ril_sim_session_cbd_unref(void *data)
-{
-	struct ril_sim_session_cbd *cbd = data;
-
-	if (--(cbd->ref_count) < 1) {
-		ril_sim_card_sim_io_finished(cbd->card, cbd->req_id);
-		ril_sim_card_unref(cbd->card);
-		g_free(cbd);
-	}
-}
-
-static void ril_sim_session_cbd_start(struct ril_sim_session_cbd *cbd,
-		GRilIoRequest* req, guint code, GRilIoChannelResponseFunc cb)
-{
-	struct ril_sim *sd = cbd->sd;
-	const guint finished_req = cbd->req_id;
-
-	cbd->ref_count++;
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req, code, cb,
-					ril_sim_session_cbd_unref, cbd);
-	ril_sim_card_sim_io_started(cbd->card, cbd->req_id);
-	ril_sim_card_sim_io_finished(cbd->card, finished_req);
-}
-
 static void ril_sim_pin_cbd_state_event_count_cb(struct ril_sim_card *sc,
 							void *user_data)
 {
@@ -372,13 +307,30 @@ static void ril_sim_append_path(struct ril_sim *sd, GRilIoRequest *req,
 		grilio_request_append_utf8(req, hex_path);
 		DBG_(sd, "%s", hex_path);
 		g_free(hex_path);
+	} else if (fileid == SIM_EF_ICCID_FILEID || fileid == SIM_EFPL_FILEID) {
+		/*
+		 * Special catch-all for EF_ICCID (unique card ID)
+		 * and EF_PL files which exist in the root directory.
+		 * As the sim_info_cb function may not have yet
+		 * recorded the app_type for the SIM, and the path
+		 * for both files is the same for 2g|3g, just hard-code.
+		 *
+		 * See 'struct ef_db' in:
+		 * ../../src/simutil.c for more details.
+		 */
+		DBG_(sd, "%s", ROOTMF);
+		grilio_request_append_utf8(req, ROOTMF);
 	} else {
 		/*
-		 * Catch-all for EF_ICCID, EF_PL and other files absent
-		 * from ef_db table in src/simutil.c, hard-code ROOTMF.
+		 * The only known case of this is EFPHASE_FILED (0x6FAE).
+		 * The ef_db table ( see /src/simutil.c ) entry for
+		 * EFPHASE contains a value of 0x0000 for it's
+		 * 'parent3g' member.  This causes a NULL path to
+		 * be returned.
 		 */
-		DBG_(sd, "%s (default)", ROOTMF);
-		grilio_request_append_utf8(req, ROOTMF);
+
+		DBG_(sd, "returning empty path.");
+		grilio_request_append_utf8(req, NULL);
 	}
 }

@@ -1470,294 +1422,6 @@ static void ril_sim_query_facility_lock(struct ofono_sim *sim,
 	grilio_request_unref(req);
 }

-static gboolean ril_sim_list_apps_cb(void *data)
-{
-	struct ril_sim_list_apps *rd = data;
-	struct ril_sim *sd = rd->sd;
-	const struct ril_sim_card_status *status = sd->card->status;
-	struct ofono_error error;
-
-	GASSERT(sd->list_apps_id);
-	sd->list_apps_id = 0;
-
-	if (status) {
-		int i, n = status->num_apps;
-		GByteArray *tlv = g_byte_array_sized_new(n * 20);
-
-		/* Reconstruct EFdir contents */
-		for (i = 0; i < n; i++) {
-			const char *hex = status->apps[i].aid;
-			gsize hex_len = hex ? strlen(hex) : 0;
-			long aid_size;
-			guint8 aid[16];
-
-			if (hex_len >= 2 && hex_len <= 2 * sizeof(aid) &&
-				!(hex_len & 0x01) && decode_hex_own_buf(hex,
-					hex_len, &aid_size, 0, aid)) {
-				guint8 buf[4];
-
-				/*
-				 * TS 102.221
-				 * 13 Application independent files
-				 * 13.1 EFdir
-				 *
-				 * Application template TLV object.
-				 */
-				buf[0] = APP_TEMPLATE_TAG;
-				buf[1] = (guint8)(aid_size + 2);
-				buf[2] = APP_ID_TAG;
-				buf[3] = (guint8)(aid_size);
-				g_byte_array_append(tlv, buf, sizeof(buf));
-				g_byte_array_append(tlv, aid, aid_size);
-			}
-		}
-		DBG_(sd, "reporting %u apps %u bytes", n, tlv->len);
-		rd->cb(ril_error_ok(&error), tlv->data, tlv->len, rd->data);
-		g_byte_array_unref(tlv);
-	} else {
-		DBG_(sd, "no SIM card, no apps");
-		rd->cb(ril_error_failure(&error), NULL, 0, rd->data);
-	}
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_sim_list_apps(struct ofono_sim *sim,
-			ofono_sim_list_apps_cb_t cb, void *data)
-{
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	struct ril_sim_list_apps *rd = g_new(struct ril_sim_list_apps, 1);
-
-	rd->sd = sd;
-	rd->cb = cb;
-	rd->data = data;
-	if (sd->list_apps_id) {
-		g_source_remove(sd->list_apps_id);
-	}
-	sd->list_apps_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-				ril_sim_list_apps_cb, rd, g_free);
-}
-
-static void ril_sim_open_channel_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_cbd_io *cbd = user_data;
-	ofono_sim_open_channel_cb_t cb = cbd->cb.open_channel;
-	struct ofono_error error;
-
-	if (status == RIL_E_SUCCESS) {
-		guint32 n, session_id;
-		GRilIoParser rilp;
-
-		grilio_parser_init(&rilp, data, len);
-		if (grilio_parser_get_uint32(&rilp, &n) && n >= 1 &&
-			grilio_parser_get_uint32(&rilp, &session_id)) {
-			DBG_(cbd->sd, "%u", session_id);
-			cb(ril_error_ok(&error), session_id, cbd->data);
-			return;
-		}
-	} else {
-		ofono_error("Open logical channel failure: %s",
-					ril_error_to_string(status));
-	}
-
-	cb(ril_error_failure(&error), 0, cbd->data);
-}
-
-static void ril_sim_open_channel(struct ofono_sim *sim,
-		const unsigned char *aid, unsigned int len,
-		ofono_sim_open_channel_cb_t cb, void *data)
-{
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
-	GRilIoRequest *req = grilio_request_new();
-	char *aid_hex = encode_hex(aid, len, 0);
-
-	DBG_(sd, "%s", aid_hex);
-	grilio_request_append_utf8(req, aid_hex);
-	grilio_request_append_int32(req, 0);
-	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
-	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_SIM_OPEN_CHANNEL,
-						ril_sim_open_channel_cb);
-	grilio_request_unref(req);
-	g_free(aid_hex);
-}
-
-static void ril_sim_close_channel_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_cbd_io *cbd = user_data;
-	struct ofono_error error;
-
-	if (status == RIL_E_SUCCESS) {
-		ril_error_init_ok(&error);
-	} else {
-		ofono_error("Close logical channel failure: %s",
-					ril_error_to_string(status));
-		ril_error_init_failure(&error);
-	}
-	cbd->cb.close_channel(&error, cbd->data);
-}
-
-static void ril_sim_close_channel(struct ofono_sim *sim, int session_id,
-		ofono_sim_close_channel_cb_t cb, void *data)
-{
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
-	GRilIoRequest *req = grilio_request_new();
-
-	DBG_(sd, "%u", session_id);
-	grilio_request_append_int32(req, 1);
-	grilio_request_append_int32(req, session_id);
-	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
-	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_SIM_CLOSE_CHANNEL,
-						ril_sim_close_channel_cb);
-	grilio_request_unref(req);
-}
-
-static void ril_sim_logical_access_get_results_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_session_cbd *cbd = user_data;
-	ofono_sim_logical_access_cb_t cb = cbd->cb;
-	struct ril_sim_io_response *res;
-	struct ofono_error err;
-
-	res = ril_sim_parse_io_response(data, len);
-	if (ril_sim_io_response_ok(res) && status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&err), res->data, res->data_len, cbd->data);
-	} else if (res) {
-		cb(ril_error_sim(&err, res->sw1, res->sw2), NULL, 0, cbd->data);
-	} else {
-		cb(ril_error_failure(&err), NULL, 0, cbd->data);
-	}
-	ril_sim_io_response_free(res);
-}
-
-static void ril_sim_logical_access_transmit(struct ril_sim_session_cbd *cbd,
-		int ins, int p1, int p2, int p3, const char *hex_data,
-		GRilIoChannelResponseFunc cb)
-{
-	GRilIoRequest *req = grilio_request_new();
-
-	DBG_(cbd->sd, "session=%u,cmd=%02X,%02X,%02X,%02X,%02X,%s",
-				cbd->session_id, cbd->cla, ins, p1, p2, p3,
-				hex_data ? hex_data : "");
-	grilio_request_append_int32(req, cbd->session_id);
-	grilio_request_append_int32(req, cbd->cla);
-	grilio_request_append_int32(req, ins);
-	grilio_request_append_int32(req, p1);
-	grilio_request_append_int32(req, p2);
-	grilio_request_append_int32(req, p3);
-	grilio_request_append_utf8(req, hex_data);
-	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
-	ril_sim_session_cbd_start(cbd, req,
-				RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL, cb);
-	grilio_request_unref(req);
-}
-
-static void ril_sim_logical_access_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_session_cbd *cbd = user_data;
-	ofono_sim_logical_access_cb_t cb = cbd->cb;
-	struct ril_sim_io_response *res;
-	struct ofono_error error;
-
-	DBG_(cbd->sd, "");
-	cbd->req_id = 0;
-	res = ril_sim_parse_io_response(data, len);
-	if (res && status == RIL_E_SUCCESS) {
-		/*
-		 * TS 102 221
-		 * 7.3.1.1.5.2 Case 4 commands
-		 *
-		 * If the UICC receives a case 4 command, after processing
-		 * the data sent with the C-APDU, it shall return:
-		 *
-		 * a) procedure bytes '61 xx' instructing the transport
-		 * layer of the terminal to issue a GET RESPONSE command
-		 * with a maximum length of 'xx'; or
-		 * b) status indicating a warning or error condition (but
-		 * not SW1 SW2 = '90 00').
-		 *
-		 * The GET RESPONSE command so issued is then treated as
-		 * described for case 2 commands.
-		 */
-		if (res->sw1 == 0x61) {
-			ril_sim_logical_access_transmit(cbd,
-				CMD_GET_RESPONSE, 0, 0, res->sw2, NULL,
-				ril_sim_logical_access_get_results_cb);
-		} else if (ril_sim_io_response_ok(res)) {
-			cb(ril_error_ok(&error), res->data, res->data_len,
-								cbd->data);
-		} else {
-			cb(ril_error_sim(&error, res->sw1, res->sw2), NULL, 0,
-								cbd->data);
-		}
-	} else {
-		cb(ril_error_failure(&error), NULL, 0, cbd->data);
-	}
-	ril_sim_io_response_free(res);
-}
-
-static void ril_sim_logical_access(struct ofono_sim *sim, int session_id,
-			const unsigned char *pdu, unsigned int len,
-			ofono_sim_logical_access_cb_t cb, void *data)
-{
-	/* SIM Command APDU: CLA INS P1 P2 P3 Data */
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	const char* hex_data;
-	char *tmp;
-	struct ril_sim_session_cbd *cbd = ril_sim_session_cbd_new(sd,
-						session_id, pdu[0], cb, data);
-
-	GASSERT(len >= 5);
-	if (len > 5) {
-		hex_data = tmp = encode_hex(pdu + 5, len - 5, 0);
-	} else {
-		tmp = NULL;
-		hex_data = "";
-	}
-
-	ril_sim_logical_access_transmit(cbd, pdu[1], pdu[2], pdu[3], pdu[4],
-					hex_data, ril_sim_logical_access_cb);
-	ril_sim_session_cbd_unref(cbd);
-	g_free(tmp);
-}
-
-static void ril_sim_session_read_binary(struct ofono_sim *sim, int session,
-			int fileid, int start, int length,
-			const unsigned char *path, unsigned int path_len,
-			ofono_sim_read_cb_t cb, void *data)
-{
-	struct ofono_error error;
-
-	ofono_error("session_read_binary not implemented");
-	cb(ril_error_failure(&error), NULL, 0, data);
-}
-
-static void ril_sim_session_read_record(struct ofono_sim *sim, int session_id,
-			int fileid, int record, int length,
-			const unsigned char *path, unsigned int path_len,
-			ofono_sim_read_cb_t cb, void *data)
-{
-	struct ofono_error error;
-
-	ofono_error("session_read_record not implemented");
-	cb(ril_error_failure(&error), NULL, 0, data);
-}
-
-static void ril_sim_session_read_info(struct ofono_sim *sim, int session_id,
-			int fileid, const unsigned char *path,
-			unsigned int path_len, ofono_sim_file_info_cb_t cb,
-			void *data)
-{
-	struct ofono_error error;
-
-	ofono_error("session_read_info not implemented");
-	cb(ril_error_failure(&error), -1, -1, -1, NULL, 0, data);
-}
-
 static void ril_sim_refresh_cb(GRilIoChannel *io, guint code,
 				const void *data, guint len, void *user_data)
 {
@@ -1839,9 +1503,6 @@ static void ril_sim_remove(struct ofono_sim *sim)
 	grilio_queue_cancel_all(sd->q, FALSE);
 	ofono_sim_set_data(sim, NULL);

-	if (sd->list_apps_id) {
-		g_source_remove(sd->list_apps_id);
-	}
 	if (sd->idle_id) {
 		g_source_remove(sd->idle_id);
 	}
@@ -1886,14 +1547,7 @@ const struct ofono_sim_driver ril_sim_driver = {
 	.reset_passwd           = ril_sim_pin_send_puk,
 	.change_passwd          = ril_sim_change_passwd,
 	.query_pin_retries      = ril_sim_query_pin_retries,
-	.query_facility_lock    = ril_sim_query_facility_lock,
-	.list_apps              = ril_sim_list_apps,
-	.open_channel2          = ril_sim_open_channel,
-	.close_channel          = ril_sim_close_channel,
-	.session_read_binary    = ril_sim_session_read_binary,
-	.session_read_record    = ril_sim_session_read_record,
-	.session_read_info      = ril_sim_session_read_info,
-	.logical_access         = ril_sim_logical_access
+	.query_facility_lock    = ril_sim_query_facility_lock
 };

 /*
--- a/ofono/drivers/ril/ril_sim_settings.h
+++ b/ofono/drivers/ril/ril_sim_settings.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -45,8 +45,6 @@ gulong ril_sim_settings_add_pref_mode_changed_handler(struct ril_sim_settings *s
 void ril_sim_settings_remove_handler(struct ril_sim_settings *s, gulong id);
 void ril_sim_settings_remove_handlers(struct ril_sim_settings *s, gulong *ids,
 								int count);
-#define ril_sim_settings_remove_all_handlers(s,ids) \
-	ril_sim_settings_remove_handlers(s, ids, G_N_ELEMENTS(ids))

 #endif /* RIL_SIM_SETTINGS_H */

--- a/ofono/drivers/ril/ril_subscription.conf
+++ b/ofono/drivers/ril/ril_subscription.conf
@@ -231,25 +231,12 @@ socket=/dev/socket/rild
 #
 #lteNetworkMode=9

-# UMTS network mode.
-#
-# Default 3 (PREF_NET_TYPE_GSM_WCDMA_AUTO)
-#
-#umtsNetworkMode=3
-
 # Timeout for RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, in milliseconds.
 #
 # Default 20000 (20 seconds)
 #
 #networkModeTimeout=20000

-# Timeout for RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC and
-# RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, in milliseconds.
-#
-# Default 100000 (100 seconds)
-#
-#networkSelectionTimeout=100000
-
 # Comma-separated signal strength range, in dBm.
 #
 # These values are used for translating dBm values returned by the modem in
@@ -288,16 +275,6 @@ socket=/dev/socket/rild
 #
 #singleDataContext=false

-# With some RILs, RIL_REQUEST_QUERY_AVAILABLE_NETWORKS returns strange
-# operator names, i.e. numeric MCC+MNC values or the same name for all
-# operators (which is actually SPN fetched from the SIM). Such strange
-# names can be replaced with operator names from MBPI database, based
-# on the operator's MCC and MNC. That may not be 100% accurate, though.
-#
-# Default false (i.e. trust RIL to report the actual names)
-#
-#replaceStrangeOperatorNames=false
-
 # Configures whether +0 is added to MCCMNC string passed to
 # RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL. Some Qualcomm RILs
 # require it, some MediaTek RILs don't like it.
@@ -325,15 +302,9 @@ socket=/dev/socket/rild
 #
 #   ss = Use legacy device state management (RIL_REQUEST_SCREEN_STATE)
 #   ds = Use newer device state management (RIL_REQUEST_SEND_DEVICE_STATE)
-#   ur = Use URC filter (RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER)
-#        This may be useful on devices with RIL version >= 15 if auto
-#        method fails
-#   auto = Choose ss or ds based on the RIL version
+#   auto = Choose one of the above based on the RIL version
 #   none = Disable device state management
 #
-# In addition to specifying ss, ds or ur method, one can specify a
-# combination of methods, e.g. ds+ur
-#
 # Default auto
 #
 #deviceStateTracking=auto
@@ -345,29 +316,3 @@ socket=/dev/socket/rild
 # Default true (false for MTK RILs)
 #
 #forceGsmWhenRadioOff=true
-
-# Configures a period between RIL_UNSOL_CELL_INFO_LIST events when the device
-# is awake. Possible values are:
-#
-#   0 = invoke RIL_UNSOL_CELL_INFO_LIST when any of the reported information
-#       changes
-#   1..INT_MAX-1 (2147483646) = sets update period in milliseconds
-#   negative value or INT_MAX = never issue a RIL_UNSOL_CELL_INFO_LIST
-#
-# On MediaTek devices the period of RIL_UNSOL_CELL_INFO_LIST events can't be
-# configured. The parameter RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE has
-# non-standard meaning:
-#
-#   0 = enable RIL_UNSOL_CELL_INFO_LIST
-#   any other value = disable RIL_UNSOL_CELL_INFO_LIST
-#
-# Default 2000
-#
-#cellInfoIntervalShortMs=2000
-
-# Configures period between RIL_UNSOL_CELL_INFO_LIST events when the device is
-# in a power saving mode. For possible values, look cellInfoIntervalShortMs.
-#
-# Default 30000
-#
-#cellInfoIntervalLongMs=30000
--- a/ofono/drivers/ril/ril_types.h
+++ b/ofono/drivers/ril/ril_types.h
@@ -24,7 +24,6 @@
 #include <grilio_types.h>
 #include <gutil_macros.h>

-struct ofono_watch;
 struct ofono_modem;
 struct ofono_sim;

@@ -50,19 +49,12 @@ struct ril_network;
 struct ril_sim_card;
 struct ril_vendor;

-enum ril_data_role {
-	RIL_DATA_ROLE_NONE,    /* Mobile data not required */
-	RIL_DATA_ROLE_MMS,     /* Data is needed at any speed */
-	RIL_DATA_ROLE_INTERNET /* Data is needed at full speed */
-};
-
 struct ril_slot_config {
 	guint slot;
 	enum ofono_radio_access_mode techs;
 	enum ril_pref_net_type lte_network_mode;
 	enum ril_pref_net_type umts_network_mode;
 	int network_mode_timeout;
-	int network_selection_timeout;
 	int signal_strength_dbm_weak;
 	int signal_strength_dbm_strong;
 	gboolean query_available_band_mode;
@@ -72,15 +64,12 @@ struct ril_slot_config {
 	gboolean enable_voicecall;
 	gboolean enable_cbs;
 	gboolean enable_stk;
-	gboolean replace_strange_oper;
 	gboolean network_selection_manual_0;
 	gboolean force_gsm_when_radio_off;
 	gboolean use_data_profiles;
 	guint mms_data_profile_id;
 	GUtilInts *local_hangup_reasons;
 	GUtilInts *remote_hangup_reasons;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 };

 #endif /* RIL_TYPES_H */
--- a/ofono/drivers/ril/ril_vendor.h
+++ b/ofono/drivers/ril/ril_vendor.h
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2016-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -24,7 +24,6 @@ struct ril_vendor_defaults {
 	gboolean legacy_imei_query;
 	gboolean enable_cbs;
 	gboolean enable_stk;
-	gboolean replace_strange_oper;
 	gboolean query_available_band_mode;
 	gboolean use_data_profiles;
 	gboolean force_gsm_when_radio_off;
--- a/ofono/drivers/ril/ril_vendor_mtk.c
+++ b/ofono/drivers/ril/ril_vendor_mtk.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2016-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -509,7 +509,6 @@ static void ril_vendor_mtk_get_defaults(struct ril_vendor_defaults *defaults)
 	defaults->empty_pin_query = FALSE;
 	defaults->legacy_imei_query = TRUE;
 	defaults->force_gsm_when_radio_off = FALSE;
-	defaults->replace_strange_oper = TRUE;
 }

 static void ril_vendor_mtk_base_init(RilVendorMtk *self, GRilIoChannel *io,
--- a/ofono/include/dbus-access.h
+++ b/ofono/include/dbus-access.h
@@ -40,7 +40,6 @@ enum ofono_dbus_access_intf {
 	OFONO_DBUS_ACCESS_INTF_MODEM,         /* org.ofono.Modem */
 	OFONO_DBUS_ACCESS_INTF_RADIOSETTINGS, /* org.ofono.RadioSettings */
 	OFONO_DBUS_ACCESS_INTF_STK,           /* org.ofono.SimToolkit */
-	OFONO_DBUS_ACCESS_INTF_OEMRAW,        /* org.ofono.OemRaw */
 	OFONO_DBUS_ACCESS_INTF_COUNT
 };

@@ -125,12 +124,6 @@ enum ofono_dbus_access_stk_method {
 	OFONO_DBUS_ACCESS_STK_METHOD_COUNT
 };

-/* OFONO_DBUS_ACCESS_INTF_OEMRAW */
-enum ofono_dbus_access_oemraw_method {
-	OFONO_DBUS_ACCESS_OEMRAW_SEND,
-	OFONO_DBUS_ACCESS_OEMRAW_METHOD_COUNT
-};
-
 #define OFONO_DBUS_ACCESS_PRIORITY_LOW     (-100)
 #define OFONO_DBUS_ACCESS_PRIORITY_DEFAULT (0)
 #define OFONO_DBUS_ACCESS_PRIORITY_HIGH    (100)
--- a/ofono/include/dbus-clients.h
+++ b/ofono/include/dbus-clients.h
@@ -1,55 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2021 Jolla Ltd.
- *  Copyright (C) 2021 Open Mobile Platform LLC.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#ifndef OFONO_DBUS_CLIENTS_H
-#define OFONO_DBUS_CLIENTS_H
-
-#include <ofono/types.h>
-#include <ofono/dbus.h>
-
-/* Since mer/1.23+git31 */
-
-struct ofono_dbus_clients;
-
-typedef void (*ofono_dbus_clients_notify_func)(const char *name,
-							void *user_data);
-
-struct ofono_dbus_clients *ofono_dbus_clients_new(DBusConnection *conn,
-		ofono_dbus_clients_notify_func notify, void *user_data);
-void ofono_dbus_clients_free(struct ofono_dbus_clients *clients);
-
-unsigned int ofono_dbus_clients_count(struct ofono_dbus_clients *clients);
-
-ofono_bool_t ofono_dbus_clients_add(struct ofono_dbus_clients *clients,
-							const char *name);
-ofono_bool_t ofono_dbus_clients_remove(struct ofono_dbus_clients *clients,
-							const char *name);
-
-void ofono_dbus_clients_signal(struct ofono_dbus_clients *clients,
-							DBusMessage *signal);
-void ofono_dbus_clients_signal_property_changed(struct ofono_dbus_clients *dc,
-		const char *path, const char *interface, const char *name,
-		int type, const void *value);
-
-#endif /* OFONO_DBUS_CLIENTS_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/include/dbus.h
+++ b/ofono/include/dbus.h
@@ -3,7 +3,7 @@
 *  oFono - Open Telephony stack for Linux
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2013-2021  Jolla Ltd.
+ *  Copyright (C) 2013-2016 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -14,6 +14,10 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
 */

 #ifndef __OFONO_DBUS_H
@@ -79,8 +83,6 @@ extern "C" {
 					DBUS_TYPE_VARIANT_AS_STRING \
 					DBUS_DICT_ENTRY_END_CHAR_AS_STRING

-#define OFONO_ERROR_INTERFACE "org.ofono.Error"
-
 DBusConnection *ofono_dbus_get_connection(void);

 void ofono_dbus_dict_append(DBusMessageIter *dict, const char *key, int type,
@@ -108,11 +110,6 @@ int ofono_dbus_signal_dict_property_changed(DBusConnection *conn,
 						const char *name, int type,
 						const void *value);

-/* Since mer/1.23+git31 */
-DBusMessage *ofono_dbus_signal_new_property_changed(const char *path,
-					const char *interface,
-					const char *name,
-					int type, const void *value);
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/gprs-context.h
+++ b/ofono/include/gprs-context.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -129,8 +128,6 @@ void ofono_gprs_context_set_ipv4_gateway(struct ofono_gprs_context *gc,
 						const char *gateway);
 void ofono_gprs_context_set_ipv4_dns_servers(struct ofono_gprs_context *gc,
 						const char **dns);
-void ofono_gprs_context_set_ipv4_proxy_cscf(struct ofono_gprs_context *gc,
-				const char **pcscf); /* Since mer/1.23+git30 */

 void ofono_gprs_context_set_ipv6_address(struct ofono_gprs_context *gc,
 						const char *address);
@@ -140,8 +137,6 @@ void ofono_gprs_context_set_ipv6_gateway(struct ofono_gprs_context *gc,
 						const char *gateway);
 void ofono_gprs_context_set_ipv6_dns_servers(struct ofono_gprs_context *gc,
 						const char **dns);
-void ofono_gprs_context_set_ipv6_proxy_cscf(struct ofono_gprs_context *gc,
-				const char **pcscf); /* Since mer/1.23+git30 */

 void ofono_gprs_context_signal_change(struct ofono_gprs_context *gc,
 							unsigned int cid);
--- a/ofono/include/sim.h
+++ b/ofono/include/sim.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -211,10 +210,6 @@ struct ofono_sim_driver {
 	void (*logical_access)(struct ofono_sim *sim, int session_id,
 			const unsigned char *pdu, unsigned int len,
 			ofono_sim_logical_access_cb_t cb, void *data);
-	/* Since mer/1.23+git28 */
-	void (*open_channel2)(struct ofono_sim *sim, const unsigned char *aid,
-			unsigned int len, ofono_sim_open_channel_cb_t cb,
-			void *data);
 };

 int ofono_sim_driver_register(const struct ofono_sim_driver *d);
--- a/ofono/plugins/hfp_ag_bluez5.c
+++ b/ofono/plugins/hfp_ag_bluez5.c
@@ -495,6 +495,8 @@ static void hfp_ag_enable(DBusConnection *conn)
 	connection_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
 	                                        g_free, connection_destroy);

+	ofono_handsfree_audio_ref();
+
 	hfp_ag_enabled = TRUE;
 }

@@ -523,6 +525,7 @@ static void hfp_ag_disable(DBusConnection *conn)
 		g_dbus_unregister_interface(conn, HFP_AG_EXT_PROFILE_PATH,
 		                            BLUEZ_PROFILE_INTERFACE);
 		ofono_handsfree_card_driver_unregister(&hfp_ag_driver);
+		ofono_handsfree_audio_unref();
 	}

 	hfp_ag_enabled = FALSE;
@@ -542,14 +545,13 @@ static int hfp_ag_init(void)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();

-	/* g_dbus_add_service_watch immediately checks for bluetooth service
-	 * and calls connect callback if the service exists. */
+	hfp_ag_enable(conn);
+
 	service_watch_id = g_dbus_add_service_watch(conn, "org.bluez",
 	                                            bluez_connect_cb,
 	                                            bluez_disconnect_cb,
 	                                            NULL, NULL);

-	ofono_handsfree_audio_ref();
 	return 0;
 }

@@ -563,7 +565,6 @@ static void hfp_ag_exit(void)
 	}

 	hfp_ag_disable(conn);
-	ofono_handsfree_audio_unref();
 }

 OFONO_PLUGIN_DEFINE(hfp_ag_bluez5, "Hands-Free Audio Gateway Profile Plugins",
--- a/ofono/plugins/hfp_hf_bluez5.c
+++ b/ofono/plugins/hfp_hf_bluez5.c
@@ -49,6 +49,7 @@
 #include <ofono/handsfree.h>
 #include <ofono/handsfree-audio.h>
 #include <ofono/siri.h>
+#include <ofono.h>

 #include <drivers/atmodem/atutil.h>
 #include <drivers/hfpmodem/slc.h>
@@ -832,6 +833,8 @@ static int hfp_init(void)
 	if (DBUS_TYPE_UNIX_FD < 0)
 		return -EBADF;

+	__ofono_handsfree_audio_manager_init();
+
 	/* Registers External Profile handler */
 	if (!g_dbus_register_interface(conn, HFP_EXT_PROFILE_PATH,
 					BLUEZ_PROFILE_INTERFACE,
@@ -887,6 +890,8 @@ static void hfp_exit(void)
 	g_dbus_client_unref(bluez);

 	ofono_handsfree_audio_unref();
+
+	__ofono_handsfree_audio_manager_cleanup();
 }

 OFONO_PLUGIN_DEFINE(hfp_bluez5, "External Hands-Free Profile Plugin", VERSION,
--- a/ofono/plugins/mbpi.c
+++ b/ofono/plugins/mbpi.c
@@ -3,7 +3,7 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2020  Jolla Ltd.
+ *  Copyright (C) 2015-2017  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -60,7 +60,6 @@ const char *mbpi_database = MBPI_DATABASE;
 */
 enum ofono_gprs_proto mbpi_default_internet_proto = OFONO_GPRS_PROTO_IPV4V6;
 enum ofono_gprs_proto mbpi_default_mms_proto = OFONO_GPRS_PROTO_IP;
-enum ofono_gprs_proto mbpi_default_ims_proto = OFONO_GPRS_PROTO_IPV4V6;
 enum ofono_gprs_proto mbpi_default_proto = OFONO_GPRS_PROTO_IP;
 enum ofono_gprs_auth_method mbpi_default_auth_method = OFONO_GPRS_AUTH_METHOD_ANY;

@@ -247,9 +246,6 @@ static void usage_start(GMarkupParseContext *context,
 	} else if (strcmp(text, "mms") == 0) {
 		apn->type = OFONO_GPRS_CONTEXT_TYPE_MMS;
 		apn->proto = mbpi_default_mms_proto;
-	} else if (strcmp(text, "ims") == 0) {
-		apn->type = OFONO_GPRS_CONTEXT_TYPE_IMS;
-		apn->proto = mbpi_default_ims_proto;
 	} else if (strcmp(text, "wap") == 0)
 		apn->type = OFONO_GPRS_CONTEXT_TYPE_WAP;
 	else
--- a/ofono/plugins/mbpi.h
+++ b/ofono/plugins/mbpi.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2013-2020  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -23,7 +22,6 @@
 extern const char *mbpi_database;
 extern enum ofono_gprs_proto mbpi_default_internet_proto;
 extern enum ofono_gprs_proto mbpi_default_mms_proto;
-extern enum ofono_gprs_proto mbpi_default_ims_proto;
 extern enum ofono_gprs_proto mbpi_default_proto;
 extern enum ofono_gprs_auth_method mbpi_default_auth_method;

--- a/ofono/plugins/sailfish_manager/sailfish_cell_info.c
+++ b/ofono/plugins/sailfish_manager/sailfish_cell_info.c
@@ -128,14 +128,6 @@ void sailfish_cell_info_set_update_interval(struct sailfish_cell_info *info,
 	}
 }

-void sailfish_cell_info_set_enabled(struct sailfish_cell_info *info,
-					gboolean enabled)
-{
-	if (info && info->proc->set_enabled) {
-		info->proc->set_enabled(info, enabled);
-	}
-}
-
 /*
 * Local Variables:
 * mode: C
--- a/ofono/plugins/sailfish_manager/sailfish_cell_info.h
+++ b/ofono/plugins/sailfish_manager/sailfish_cell_info.h
@@ -89,7 +89,6 @@ struct sailfish_cell_info_proc {
 					sailfish_cell_info_cb_t cb, void *arg);
 	void (*remove_handler)(struct sailfish_cell_info *info, gulong id);
 	void (*set_update_interval)(struct sailfish_cell_info *info, int ms);
-	void (*set_enabled)(struct sailfish_cell_info *info, gboolean enabled);
 };

 /* Utilities */
@@ -108,8 +107,6 @@ void sailfish_cell_info_remove_handler(struct sailfish_cell_info *info,
 					gulong id);
 void sailfish_cell_info_set_update_interval(struct sailfish_cell_info *info,
 					int ms);
-void sailfish_cell_info_set_enabled(struct sailfish_cell_info *info,
-					gboolean enabled);

 #endif /* SAILFISH_CELINFO_H */

--- a/ofono/plugins/sailfish_manager/sailfish_cell_info_dbus.c
+++ b/ofono/plugins/sailfish_manager/sailfish_cell_info_dbus.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -18,7 +18,6 @@

 #include <ofono/modem.h>
 #include <ofono/dbus.h>
-#include <ofono/dbus-clients.h>
 #include <ofono/log.h>

 #include <gdbus.h>
@@ -36,13 +35,11 @@ struct sailfish_cell_info_dbus {
 	gulong handler_id;
 	guint next_cell_id;
 	GSList *entries;
-	struct ofono_dbus_clients *clients;
 };

 #define CELL_INFO_DBUS_INTERFACE            "org.nemomobile.ofono.CellInfo"
 #define CELL_INFO_DBUS_CELLS_ADDED_SIGNAL   "CellsAdded"
 #define CELL_INFO_DBUS_CELLS_REMOVED_SIGNAL "CellsRemoved"
-#define CELL_INFO_DBUS_UNSUBSCRIBED_SIGNAL  "Unsubscribed"

 #define CELL_DBUS_INTERFACE_VERSION         (1)
 #define CELL_DBUS_INTERFACE                 "org.nemomobile.ofono.Cell"
@@ -325,24 +322,21 @@ static void sailfish_cell_info_dbus_emit_path_list
 		(struct sailfish_cell_info_dbus *dbus, const char *name,
 							GPtrArray *list)
 {
-	if (ofono_dbus_clients_count(dbus->clients)) {
-		guint i;
-		DBusMessageIter it, a;
-		DBusMessage *signal = dbus_message_new_signal(dbus->path,
+	guint i;
+	DBusMessageIter it, array;
+	DBusMessage *signal = dbus_message_new_signal(dbus->path,
 					CELL_INFO_DBUS_INTERFACE, name);

-		dbus_message_iter_init_append(signal, &it);
-		dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY, "o", &a);
-		for (i = 0; i < list->len; i++) {
-			const char* path = list->pdata[i];
-
-			dbus_message_iter_append_basic(&a,
-					DBUS_TYPE_OBJECT_PATH, &path);
-		}
-		dbus_message_iter_close_container(&it, &a);
-		ofono_dbus_clients_signal(dbus->clients, signal);
-		dbus_message_unref(signal);
+	dbus_message_iter_init_append(signal, &it);
+	dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY, "o", &array);
+	for (i = 0; i < list->len; i++) {
+		const char* path = list->pdata[i];
+		dbus_message_iter_append_basic(&array, DBUS_TYPE_OBJECT_PATH,
+								&path);
 	}
+	dbus_message_iter_close_container(&it, &array);
+
+	g_dbus_send_message(dbus->conn, signal);
 }

 static int sailfish_cell_info_dbus_compare(const struct sailfish_cell *c1,
@@ -372,23 +366,6 @@ static int sailfish_cell_info_dbus_compare(const struct sailfish_cell *c1,
 	}
 }

-static void sailfish_cell_info_dbus_emit_signal
-		(struct sailfish_cell_info_dbus *dbus,
-				const char *path, const char *intf,
-				const char *name, int type, ...)
-{
-	if (ofono_dbus_clients_count(dbus->clients)) {
-		va_list args;
-		DBusMessage *signal = dbus_message_new_signal(path, intf, name);
-
-		va_start(args, type);
-		dbus_message_append_args_valist(signal, type, args);
-		ofono_dbus_clients_signal(dbus->clients, signal);
-		dbus_message_unref(signal);
-		va_end(args);
-	}
-}
-
 static void sailfish_cell_info_dbus_property_changed
 		(struct sailfish_cell_info_dbus *dbus,
 			const struct sailfish_cell_entry *entry, int mask)
@@ -400,8 +377,7 @@ static void sailfish_cell_info_dbus_property_changed

 	if (mask & SAILFISH_CELL_PROPERTY_REGISTERED) {
 		const dbus_bool_t registered = (cell->registered != FALSE);
-
-		sailfish_cell_info_dbus_emit_signal(dbus, entry->path,
+		g_dbus_emit_signal(dbus->conn, entry->path,
 			CELL_DBUS_INTERFACE,
 			CELL_DBUS_REGISTERED_CHANGED_SIGNAL,
 			DBUS_TYPE_BOOLEAN, &registered, DBUS_TYPE_INVALID);
@@ -410,10 +386,9 @@ static void sailfish_cell_info_dbus_property_changed

 	for (i = 0; i < n && mask; i++) {
 		if (mask & prop[i].flag) {
-			ofono_dbus_clients_signal_property_changed(
-				dbus->clients, entry->path,
-				CELL_DBUS_INTERFACE, prop[i].name,
-				DBUS_TYPE_INT32,
+			ofono_dbus_signal_property_changed(dbus->conn,
+				entry->path, CELL_DBUS_INTERFACE,
+				prop[i].name, DBUS_TYPE_INT32,
 				G_STRUCT_MEMBER_P(&cell->info, prop[i].off));
 			mask &= ~prop[i].flag;
 		}
@@ -436,7 +411,7 @@ static void sailfish_cell_info_dbus_update_entries
 						sailfish_cell_compare_func)) {
 			DBG("%s removed", entry->path);
 			dbus->entries = g_slist_delete_link(dbus->entries, l);
-			sailfish_cell_info_dbus_emit_signal(dbus, entry->path,
+			g_dbus_emit_signal(dbus->conn, entry->path,
 					CELL_DBUS_INTERFACE,
 					CELL_DBUS_REMOVED_SIGNAL,
 					DBUS_TYPE_INVALID);
@@ -517,67 +492,29 @@ static void sailfish_cell_info_dbus_cells_changed_cb
 		((struct sailfish_cell_info_dbus *)arg, TRUE);
 }

-static DBusMessage *sailfish_cell_info_dbus_error_failed(DBusMessage *msg,
-						const char *explanation)
-{
-	return g_dbus_create_error(msg, OFONO_ERROR_INTERFACE ".Failed", "%s",
-								explanation);
-}
-
 static DBusMessage *sailfish_cell_info_dbus_get_cells(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
 	struct sailfish_cell_info_dbus *dbus = data;
-	const char *sender = dbus_message_get_sender(msg);
+	DBusMessage *reply = dbus_message_new_method_return(msg);
+	DBusMessageIter it, array;
+	GSList *l;

-	if (ofono_dbus_clients_add(dbus->clients, sender)) {
-		DBusMessage *reply = dbus_message_new_method_return(msg);
-		DBusMessageIter it, a;
-		GSList *l;
-
-		sailfish_cell_info_set_enabled(dbus->info, TRUE);
-		dbus_message_iter_init_append(reply, &it);
-		dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY, "o", &a);
-		for (l = dbus->entries; l; l = l->next) {
-			const struct sailfish_cell_entry *entry = l->data;
-
-			dbus_message_iter_append_basic(&a,
-					DBUS_TYPE_OBJECT_PATH, &entry->path);
-		}
-		dbus_message_iter_close_container(&it, &a);
-		return reply;
+	dbus_message_iter_init_append(reply, &it);
+	dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY, "o", &array);
+	for (l = dbus->entries; l; l = l->next) {
+		const struct sailfish_cell_entry *entry = l->data;
+		dbus_message_iter_append_basic(&array, DBUS_TYPE_OBJECT_PATH,
+								&entry->path);
 	}
-	return sailfish_cell_info_dbus_error_failed(msg, "Operation failed");
-}
-
-static DBusMessage *sailfish_cell_info_dbus_unsubscribe(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct sailfish_cell_info_dbus *dbus = data;
-	const char *sender = dbus_message_get_sender(msg);
-
-	DBG("%s", sender);
-	if (ofono_dbus_clients_remove(dbus->clients, sender)) {
-		DBusMessage *signal = dbus_message_new_signal(dbus->path,
-			CELL_INFO_DBUS_INTERFACE,
-			CELL_INFO_DBUS_UNSUBSCRIBED_SIGNAL);
-
-		if (!ofono_dbus_clients_count(dbus->clients)) {
-			sailfish_cell_info_set_enabled(dbus->info, FALSE);
-		}
-		dbus_message_set_destination(signal, sender);
-		g_dbus_send_message(dbus->conn, signal);
-		return dbus_message_new_method_return(msg);
-	}
-	return sailfish_cell_info_dbus_error_failed(msg, "Not subscribed");
+	dbus_message_iter_close_container(&it, &array);
+	return reply;
 }

 static const GDBusMethodTable sailfish_cell_info_dbus_methods[] = {
 	{ GDBUS_METHOD("GetCells", NULL,
 			GDBUS_ARGS({ "paths", "ao" }),
 			sailfish_cell_info_dbus_get_cells) },
-	{ GDBUS_METHOD("Unsubscribe", NULL, NULL,
-			sailfish_cell_info_dbus_unsubscribe) },
 	{ }
 };

@@ -586,20 +523,9 @@ static const GDBusSignalTable sailfish_cell_info_dbus_signals[] = {
 			GDBUS_ARGS({ "paths", "ao" })) },
 	{ GDBUS_SIGNAL(CELL_INFO_DBUS_CELLS_REMOVED_SIGNAL,
 			GDBUS_ARGS({ "paths", "ao" })) },
-	{ GDBUS_SIGNAL(CELL_INFO_DBUS_UNSUBSCRIBED_SIGNAL,
-			GDBUS_ARGS({})) },
 	{ }
 };

-static void sailfish_cell_info_dbus_disconnect_cb(const char *name, void *data)
-{
-	struct sailfish_cell_info_dbus *dbus = data;
-
-	if (!ofono_dbus_clients_count(dbus->clients)) {
-		sailfish_cell_info_set_enabled(dbus->info, FALSE);
-	}
-}
-
 struct sailfish_cell_info_dbus *sailfish_cell_info_dbus_new
 		(struct ofono_modem *modem, struct sailfish_cell_info *info)
 {
@@ -624,8 +550,6 @@ struct sailfish_cell_info_dbus *sailfish_cell_info_dbus_new
 			ofono_modem_add_interface(modem,
 						CELL_INFO_DBUS_INTERFACE);
 			sailfish_cell_info_dbus_update_entries(dbus, FALSE);
-			dbus->clients = ofono_dbus_clients_new(dbus->conn,
-				sailfish_cell_info_dbus_disconnect_cb, dbus);
 			return dbus;
 		} else {
 			ofono_error("CellInfo D-Bus register failed");
@@ -641,7 +565,6 @@ void sailfish_cell_info_dbus_free(struct sailfish_cell_info_dbus *dbus)
 		GSList *l;

 		DBG("%s", dbus->path);
-		ofono_dbus_clients_free(dbus->clients);
 		g_dbus_unregister_interface(dbus->conn, dbus->path,
 					CELL_INFO_DBUS_INTERFACE);

--- a/ofono/plugins/sailfish_provision.c
+++ b/ofono/plugins/sailfish_provision.c
@@ -2,7 +2,7 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2013-2020  Jolla Ltd.
+ *  Copyright (C) 2013-2017  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -136,56 +136,38 @@ static GSList *provision_pick_best_ap(GSList *list, const char *spn,
 	}
 }

-/**
- * Returns the list containing INTERNET, MMS and IMS access points,
- * always all three of them and always in this order.
- */
+/* Returns the list containing exactly one INTERNET and one MMS access point */
 static GSList *provision_normalize_apn_list(GSList *apns, const char *spn)
 {
 	static const struct provision_ap_defaults internet_defaults =
 		{ OFONO_GPRS_CONTEXT_TYPE_INTERNET, "Internet", "internet" };
 	static const struct provision_ap_defaults mms_defaults =
 		{ OFONO_GPRS_CONTEXT_TYPE_MMS, "MMS", "mms" };
-	static const struct provision_ap_defaults ims_defaults =
-		{ OFONO_GPRS_CONTEXT_TYPE_IMS, "IMS", "ims" };

 	GSList *internet_apns = NULL;
 	GSList *mms_apns = NULL;
-	GSList *ims_apns = NULL;

-	/* Build separate apn list for each type */
+	/* Split internet and mms apns, delete all others */
 	while (apns) {
 		GSList *link = apns;
 		struct ofono_gprs_provision_data *ap = link->data;

 		apns = g_slist_remove_link(apns, link);
-		switch (ap->type) {
-		case OFONO_GPRS_CONTEXT_TYPE_INTERNET:
+		if (ap->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET) {
 			internet_apns = g_slist_concat(internet_apns, link);
-			break;
-		case OFONO_GPRS_CONTEXT_TYPE_MMS:
+		} else if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
 			mms_apns = g_slist_concat(mms_apns, link);
-			break;
-		case OFONO_GPRS_CONTEXT_TYPE_IMS:
-			ims_apns = g_slist_concat(ims_apns, link);
-			break;
-		default:
+		} else {
 			g_slist_free_full(link, provision_free_ap);
-			break;
 		}
 	}

-	/* Pick the best ap of each type */
-	internet_apns = provision_pick_best_ap(internet_apns, spn,
-			mbpi_default_internet_proto, &internet_defaults);
-	mms_apns = provision_pick_best_ap(mms_apns, spn,
-			mbpi_default_mms_proto, &mms_defaults);
-	ims_apns = provision_pick_best_ap(ims_apns, spn,
-			mbpi_default_ims_proto, &ims_defaults);
-
-	/* And concatenate them in the right order */
-	return g_slist_concat(internet_apns, g_slist_concat(mms_apns,
-								ims_apns));
+	/* Pick the best ap of each type and concatenate them */
+	return g_slist_concat(
+		provision_pick_best_ap(internet_apns, spn,
+			mbpi_default_internet_proto, &internet_defaults),
+		provision_pick_best_ap(mms_apns, spn,
+			mbpi_default_mms_proto, &mms_defaults));
 }

 int provision_get_settings(const char *mcc, const char *mnc,
--- a/ofono/plugins/smshistory.c
+++ b/ofono/plugins/smshistory.c
@@ -4,7 +4,6 @@
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
 *  Copyright (C) 2013  Jolla Ltd. All rights reserved.
- *  Copyright (C) 2020  Open Mobile Platform LLС. All rights reserved.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -27,7 +26,6 @@

 #include <string.h>
 #include <stdio.h>
-#include <errno.h>
 #include <glib.h>
 #include <gdbus.h>

@@ -42,42 +40,58 @@

 #define SMS_HISTORY_INTERFACE "org.ofono.SmsHistory"

+gboolean sms_history_interface_registered = FALSE;
+
 static const GDBusSignalTable sms_history_signals[] = {
 	{ GDBUS_SIGNAL("StatusReport",
 		GDBUS_ARGS({ "message", "s" }, { "Delivered", "a{b}" })) },
 	{ }
 };

-static int sms_history_probe(struct ofono_history_context *context)
+static void sms_history_cleanup(gpointer user)
 {
+	struct ofono_modem *modem = user;
+	DBG("modem %p", modem);
+	ofono_modem_remove_interface(modem, SMS_HISTORY_INTERFACE);
+	sms_history_interface_registered = FALSE;
+}
+
+static gboolean sms_history_ensure_interface(
+		struct ofono_modem *modem) {
+
+	if (sms_history_interface_registered)
+		return TRUE;
+
+	/* Late initialization of the D-Bus interface */
 	DBusConnection *conn = ofono_dbus_get_connection();
-	struct ofono_modem *modem = context->modem;
-
-	ofono_debug("SMS History Probe for modem: %p", modem);
-
+	if (conn == NULL)
+		return FALSE;
 	if (!g_dbus_register_interface(conn,
 					ofono_modem_get_path(modem),
 					SMS_HISTORY_INTERFACE,
-					NULL, sms_history_signals,
-					NULL, NULL, NULL)) {
+					NULL, sms_history_signals, NULL,
+					modem, sms_history_cleanup)) {
 		ofono_error("Could not create %s interface",
 				SMS_HISTORY_INTERFACE);
-		return -EIO;
+		return FALSE;
 	}
-
+	sms_history_interface_registered = TRUE;
 	ofono_modem_add_interface(modem, SMS_HISTORY_INTERFACE);
+
+	return TRUE;
+}
+
+
+static int sms_history_probe(struct ofono_history_context *context)
+{
+	ofono_debug("SMS History Probe for modem: %p", context->modem);
+	sms_history_ensure_interface(context->modem);
 	return 0;
 }

 static void sms_history_remove(struct ofono_history_context *context)
 {
-	DBusConnection *conn = ofono_dbus_get_connection();
-	struct ofono_modem *modem = context->modem;
-
-	ofono_debug("SMS History remove for modem: %p", modem);
-	ofono_modem_remove_interface(modem, SMS_HISTORY_INTERFACE);
-	g_dbus_unregister_interface(conn, ofono_modem_get_path(modem),
-					SMS_HISTORY_INTERFACE);
+	ofono_debug("SMS History Remove for modem: %p", context->modem);
 }

 static void sms_history_sms_send_status(
@@ -88,6 +102,9 @@ static void sms_history_sms_send_status(
 {
 	DBG("");

+	if (!sms_history_ensure_interface(context->modem))
+		return;
+
 	if ((s == OFONO_HISTORY_SMS_STATUS_DELIVERED) 
 			|| (s == OFONO_HISTORY_SMS_STATUS_DELIVER_FAILED)) {

@@ -157,3 +174,4 @@ static void sms_history_exit(void)
 OFONO_PLUGIN_DEFINE(sms_history, "SMS History Plugin",
 			VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT,
 			sms_history_init, sms_history_exit)
+
--- a/ofono/src/dbus-access.c
+++ b/ofono/src/dbus-access.c
@@ -44,8 +44,6 @@ const char *ofono_dbus_access_intf_name(enum ofono_dbus_access_intf intf)
 		return OFONO_RADIO_SETTINGS_INTERFACE;
 	case OFONO_DBUS_ACCESS_INTF_STK:
 		return OFONO_STK_INTERFACE;
-	case OFONO_DBUS_ACCESS_INTF_OEMRAW:
-		return "org.ofono.OemRaw";
 	case OFONO_DBUS_ACCESS_INTF_COUNT:
 		break;
 	}
@@ -178,14 +176,6 @@ const char *ofono_dbus_access_method_name(enum ofono_dbus_access_intf intf,
 			break;
 		}
 		break;
-	case OFONO_DBUS_ACCESS_INTF_OEMRAW:
-		switch ((enum ofono_dbus_access_oemraw_method)method) {
-		case OFONO_DBUS_ACCESS_OEMRAW_SEND:
-			return "Send";
-		case OFONO_DBUS_ACCESS_OEMRAW_METHOD_COUNT:
-			break;
-		}
-		break;
 	case OFONO_DBUS_ACCESS_INTF_COUNT:
 		break;
 	}
--- a/ofono/src/dbus-clients.c
+++ b/ofono/src/dbus-clients.c
@@ -1,182 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2017-2018 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#include <ofono/dbus-clients.h>
-#include <ofono/gdbus.h>
-#include <ofono/log.h>
-
-struct ofono_dbus_client {
-	struct ofono_dbus_clients *clients;
-	char *name;
-	unsigned int watch_id;
-};
-
-struct ofono_dbus_clients {
-	DBusConnection* conn;
-	GHashTable* table;
-	ofono_dbus_clients_notify_func notify;
-	void *user_data;
-};
-
-/* Compatible with GDestroyNotify */
-static void ofono_dbus_client_free(struct ofono_dbus_client *client)
-{
-	struct ofono_dbus_clients *clients = client->clients;
-
-	/* Callers make sure that client parameter is not NULL */
-	if (client->watch_id) {
-		g_dbus_remove_watch(clients->conn, client->watch_id);
-	}
-	g_free(client->name);
-	g_slice_free(struct ofono_dbus_client, client);
-}
-
-static void ofono_dbus_clients_disconnect_notify(DBusConnection *connection,
-							void *user_data)
-{
-	struct ofono_dbus_client *client = user_data;
-	struct ofono_dbus_clients *self = client->clients;
-	char *name = client->name;
-
-	/*
-	 * Steal the name so that it doesn't get freed by
-	 * ofono_dbus_client_free(). We want to pass it to
-	 * the callback but first we need to delete client's
-	 * entry from the hashtable.
-	 */
-	client->name = NULL;
-	DBG("%s is gone", name);
-	g_hash_table_remove(self->table, name);
-	if (self->notify) {
-		self->notify(name, self->user_data);
-	}
-	g_free(name);
-}
-
-struct ofono_dbus_clients *ofono_dbus_clients_new(DBusConnection *conn,
-		ofono_dbus_clients_notify_func notify, void *user_data)
-{
-	if (conn) {
-		struct ofono_dbus_clients *self =
-			g_slice_new0(struct ofono_dbus_clients);
-
-		self->conn = dbus_connection_ref(conn);
-		self->table = g_hash_table_new_full(g_str_hash, g_str_equal,
-				NULL, (GDestroyNotify) ofono_dbus_client_free);
-		self->notify = notify;
-		self->user_data = user_data;
-		return self;
-	}
-	return NULL;
-}
-
-void ofono_dbus_clients_free(struct ofono_dbus_clients *self)
-{
-	if (self) {
-		g_hash_table_destroy(self->table);
-		dbus_connection_unref(self->conn);
-		g_slice_free(struct ofono_dbus_clients, self);
-	}
-}
-
-unsigned int ofono_dbus_clients_count(struct ofono_dbus_clients *self)
-{
-	return self ? g_hash_table_size(self->table) : 0;
-}
-
-ofono_bool_t ofono_dbus_clients_add(struct ofono_dbus_clients *self,
-							const char *name)
-{
-	if (self && name) {
-		struct ofono_dbus_client *client =
-				g_slice_new0(struct ofono_dbus_client);
-
-		client->clients = self;
-		client->name = g_strdup(name);
-		client->watch_id = g_dbus_add_disconnect_watch(self->conn,
-			client->name, ofono_dbus_clients_disconnect_notify,
-			client, NULL);
-
-		if (client->watch_id) {
-			DBG("%s is registered", client->name);
-			g_hash_table_replace(self->table, (gpointer)
-				client->name, client);
-			return TRUE;
-		} else {
-			DBG("failed to register %s", client->name);
-			ofono_dbus_client_free(client);
-		}
-	}
-	return FALSE;
-}
-
-ofono_bool_t ofono_dbus_clients_remove(struct ofono_dbus_clients *self,
-							const char *name)
-{
-	return self && name && g_hash_table_remove(self->table, name);
-}
-
-void ofono_dbus_clients_signal(struct ofono_dbus_clients *self,
-							DBusMessage *signal)
-{
-	if (self && signal && g_hash_table_size(self->table)) {
-		GHashTableIter it;
-		gpointer key;
-		const char *last_name = NULL;
-
-		g_hash_table_iter_init(&it, self->table);
-		g_hash_table_iter_next(&it, &key, NULL);
-		last_name = key;
-
-		while (g_hash_table_iter_next(&it, &key, NULL)) {
-			DBusMessage *copy = dbus_message_copy(signal);
-
-			dbus_message_set_destination(copy, key);
-			g_dbus_send_message(self->conn, copy);
-		}
-
-		/*
-		 * The last one. Note that g_dbus_send_message() unrefs
-		 * the message, we need compensate for that by adding a
-		 * reference. The caller still owns the message when this
-		 * function returns.
-		 */
-		dbus_message_ref(signal);
-		dbus_message_set_destination(signal, last_name);
-		g_dbus_send_message(self->conn, signal);
-	}
-}
-
-void ofono_dbus_clients_signal_property_changed(struct ofono_dbus_clients *self,
-		const char *path, const char *interface, const char *name,
-		int type, const void *value)
-{
-	if (self && g_hash_table_size(self->table)) {
-		DBusMessage *sig = ofono_dbus_signal_new_property_changed(path,
-			interface, name, type, value);
-
-		ofono_dbus_clients_signal(self, sig);
-		dbus_message_unref(sig);
-	}
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/src/dbus-queue.c
+++ b/ofono/src/dbus-queue.c
@@ -121,30 +121,6 @@ void __ofono_dbus_queue_request(struct ofono_dbus_queue *q,
 	}
 }

-static void __ofono_dbus_queue_submit_next(struct ofono_dbus_queue *q)
-{
-	struct ofono_dbus_queue_request *next = q->requests;
-
-	while (next) {
-		struct ofono_dbus_queue_request *done;
-		DBusMessage *reply = next->fn(next->msg, next->data);
-
-		/* The request has been sent, no reply yet */
-		if (!reply)
-			break;
-
-		/* The request has completed synchronously */
-		done = next;
-		next = done->next;
-		q->requests = next;
-		done->next = NULL;
-
-		/* Send the reply */
-		__ofono_dbus_pending_reply(&done->msg, reply);
-		__ofono_dbus_queue_req_free(done);
-	}
-}
-
 /* Consumes one reference to the reply */
 void __ofono_dbus_queue_reply_msg(struct ofono_dbus_queue *q,
 							DBusMessage *reply)
@@ -174,7 +150,20 @@ void __ofono_dbus_queue_reply_msg(struct ofono_dbus_queue *q,
 	__ofono_dbus_queue_req_free(done);

 	/* Submit the next request if there is any */
-	__ofono_dbus_queue_submit_next(q);
+	while (next && reply) {
+		reply = next->fn(next->msg, next->data);
+		if (reply) {
+			/* The request has completed synchronously */
+			done = next;
+			next = done->next;
+			q->requests = next;
+			done->next = NULL;
+
+			/* Send the reply */
+			__ofono_dbus_pending_reply(&done->msg, reply);
+			__ofono_dbus_queue_req_free(done);
+		}
+	}
 }

 void __ofono_dbus_queue_reply_ok(struct ofono_dbus_queue *q)
@@ -261,10 +250,8 @@ void __ofono_dbus_queue_reply_all_fn_param(struct ofono_dbus_queue *q,
 	 * Find all other requests with the same handler and the same data
 	 * and complete those too (except when the handler is NULL)
 	 */
-	if (!handler) {
-		__ofono_dbus_queue_submit_next(q);
+	if (!handler)
 		return;
-	}

 	prev = NULL;
 	req = q->requests;
@@ -287,7 +274,6 @@ void __ofono_dbus_queue_reply_all_fn_param(struct ofono_dbus_queue *q,
 		
 		req = next;
 	}
-	__ofono_dbus_queue_submit_next(q);
 }

 /*
--- a/ofono/src/dbus.c
+++ b/ofono/src/dbus.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2013-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -14,6 +13,10 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
 */

 #ifdef HAVE_CONFIG_H
@@ -26,6 +29,8 @@

 #include "ofono.h"

+#define OFONO_ERROR_INTERFACE "org.ofono.Error"
+
 static DBusConnection *g_connection;

 struct error_mapping_entry {
@@ -204,8 +209,8 @@ void ofono_dbus_dict_append_dict(DBusMessageIter *dict, const char *key,
 	dbus_message_iter_close_container(dict, &entry);
 }

-/* Since mer/1.23+git31 */
-DBusMessage *ofono_dbus_signal_new_property_changed(const char *path,
+int ofono_dbus_signal_property_changed(DBusConnection *conn,
+					const char *path,
 					const char *interface,
 					const char *name,
 					int type, const void *value)
@@ -214,8 +219,11 @@ DBusMessage *ofono_dbus_signal_new_property_changed(const char *path,
 	DBusMessageIter iter;

 	signal = dbus_message_new_signal(path, interface, "PropertyChanged");
-	if (signal == NULL)
-		return NULL;
+	if (signal == NULL) {
+		ofono_error("Unable to allocate new %s.PropertyChanged signal",
+				interface);
+		return -1;
+	}

 	dbus_message_iter_init_append(signal, &iter);

@@ -223,24 +231,6 @@ DBusMessage *ofono_dbus_signal_new_property_changed(const char *path,

 	append_variant(&iter, type, value);

-	return signal;
-}
-
-int ofono_dbus_signal_property_changed(DBusConnection *conn,
-					const char *path,
-					const char *interface,
-					const char *name,
-					int type, const void *value)
-{
-	DBusMessage *signal = ofono_dbus_signal_new_property_changed(path,
-						interface, name, type, value);
-
-	if (signal == NULL) {
-		ofono_error("Unable to allocate new %s.PropertyChanged signal",
-				interface);
-		return -1;
-	}
-
 	return g_dbus_send_message(conn, signal);
 }

--- a/ofono/src/emulator.c
+++ b/ofono/src/emulator.c
@@ -994,17 +994,18 @@ static void bac_cb(GAtServer *server, GAtServerRequestType type,
 		/*
 		 * CVSD codec is mandatory and must come first.
 		 * See HFP v1.6 4.34.1
-		 * However, some headsets send the list in wrong order,
-		 * but function fine otherwise, so to get those working
-		 * let's not be pedantic about the codec order.
 		 */
+		if (g_at_result_iter_next_number(&iter, &val) == FALSE ||
+				val != HFP_CODEC_CVSD)
+			goto fail;
+
+		em->bac_received = TRUE;
+
+		em->negotiated_codec = 0;
+		em->r_codecs[CVSD_OFFSET].supported = TRUE;
+
 		while (g_at_result_iter_next_number(&iter, &val)) {
 			switch (val) {
-			case HFP_CODEC_CVSD:
-				em->bac_received = TRUE;
-				em->negotiated_codec = 0;
-				em->r_codecs[CVSD_OFFSET].supported = TRUE;
-				break;
 			case HFP_CODEC_MSBC:
 				em->r_codecs[MSBC_OFFSET].supported = TRUE;
 				break;
@@ -1014,11 +1015,6 @@ static void bac_cb(GAtServer *server, GAtServerRequestType type,
 			}
 		}

-		if (!em->bac_received) {
-			DBG("Mandatory codec %d not received.", HFP_CODEC_CVSD);
-			goto fail;
-		}
-
 		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);

 		/*
--- a/ofono/src/gprs.c
+++ b/ofono/src/gprs.c
@@ -3,7 +3,7 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
+ *  Copyright (C) 2015-2019  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -97,7 +97,6 @@ struct ipv4_settings {
 	char *netmask;
 	char *gateway;
 	char **dns;
-	char **pcscf;
 	char *proxy;
 };

@@ -106,7 +105,6 @@ struct ipv6_settings {
 	unsigned char prefix_len;
 	char *gateway;
 	char **dns;
-	char **pcscf;
 };

 struct context_settings {
@@ -412,7 +410,6 @@ static void context_settings_free(struct context_settings *settings)
 		g_free(settings->ipv4->netmask);
 		g_free(settings->ipv4->gateway);
 		g_strfreev(settings->ipv4->dns);
-		g_strfreev(settings->ipv4->pcscf);
 		g_free(settings->ipv4->proxy);

 		g_free(settings->ipv4);
@@ -423,7 +420,6 @@ static void context_settings_free(struct context_settings *settings)
 		g_free(settings->ipv6->ip);
 		g_free(settings->ipv6->gateway);
 		g_strfreev(settings->ipv6->dns);
-		g_strfreev(settings->ipv6->pcscf);

 		g_free(settings->ipv6);
 		settings->ipv6 = NULL;
@@ -488,11 +484,6 @@ static void context_settings_append_ipv4(struct context_settings *settings,
 						DBUS_TYPE_STRING,
 						&settings->ipv4->dns);

-	if (settings->ipv4->pcscf)
-		ofono_dbus_dict_append_array(&array, "ProxyCSCF",
-						DBUS_TYPE_STRING,
-						&settings->ipv4->pcscf);
-
 done:
 	dbus_message_iter_close_container(&variant, &array);

@@ -558,11 +549,6 @@ static void context_settings_append_ipv6(struct context_settings *settings,
 						DBUS_TYPE_STRING,
 						&settings->ipv6->dns);

-	if (settings->ipv6->pcscf)
-		ofono_dbus_dict_append_array(&array, "ProxyCSCF",
-						DBUS_TYPE_STRING,
-						&settings->ipv6->pcscf);
-
 done:
 	dbus_message_iter_close_container(&variant, &array);

@@ -2888,53 +2874,12 @@ static void provision_contexts(struct ofono_gprs *gprs, const char *mcc,
 		return;
 	}

-	for (i = 0; i < count; i++) {
-		const struct ofono_gprs_provision_data *ap = settings + i;
-
-		if (!ofono_gprs_context_settings_by_type(gprs, ap->type)) {
-			provision_context(ap, gprs);
-		}
-	}
+	for (i = 0; i < count; i++)
+		provision_context(&settings[i], gprs);

 	__ofono_gprs_provision_free_settings(settings, count);
 }

-static gboolean all_contexts_configured(struct ofono_gprs *gprs)
-{
-	GSList *l;
-
-	for (l = gprs->context_drivers; l; l = l->next) {
-		struct ofono_gprs_context *gc = l->data;
-
-		if (gc->type != OFONO_GPRS_CONTEXT_TYPE_ANY &&
-			!ofono_gprs_context_settings_by_type(gprs, gc->type)) {
-			return FALSE; /* Not yet */
-		}
-	}
-
-	return TRUE;
-}
-
-static void configure_remaining_contexts(struct ofono_gprs *gprs)
-{
-	GSList *l;
-
-	for (l = gprs->context_drivers; l; l = l->next) {
-		struct ofono_gprs_context *gc = l->data;
-
-		if (gc->type != OFONO_GPRS_CONTEXT_TYPE_ANY &&
-			!ofono_gprs_context_settings_by_type(gprs, gc->type)) {
-			add_context(gprs, NULL, gc->type);
-		}
-	}
-
-	/* Make sure internet context is there */
-	if (!ofono_gprs_context_settings_by_type(gprs,
-					OFONO_GPRS_CONTEXT_TYPE_INTERNET)) {
-		add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);
-	}
-}
-
 static void remove_non_active_context(struct ofono_gprs *gprs,
 				struct pri_context *ctx, DBusConnection *conn)
 {
@@ -3015,7 +2960,8 @@ static DBusMessage *gprs_reset_contexts(DBusConnection *conn,
 	provision_contexts(gprs, ofono_sim_get_mcc(sim),
 				ofono_sim_get_mnc(sim), ofono_sim_get_spn(sim));

-	configure_remaining_contexts(gprs);
+	if (gprs->contexts == NULL) /* Automatic provisioning failed */
+		add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);

 	for (l = gprs->contexts; l; l = l->next) {
 		struct pri_context *ctx = l->data;
@@ -3431,18 +3377,6 @@ void ofono_gprs_context_set_ipv4_dns_servers(struct ofono_gprs_context *gc,
 	settings->ipv4->dns = g_strdupv((char **) dns);
 }

-void ofono_gprs_context_set_ipv4_proxy_cscf(struct ofono_gprs_context *gc,
-						const char **pcscf)
-{
-	struct context_settings *settings = gc->settings;
-
-	if (settings->ipv4 == NULL)
-		return;
-
-	g_strfreev(settings->ipv4->pcscf);
-	settings->ipv4->pcscf = g_strdupv((char **) pcscf);
-}
-
 void ofono_gprs_context_set_ipv6_address(struct ofono_gprs_context *gc,
 						const char *address)
 {
@@ -3490,18 +3424,6 @@ void ofono_gprs_context_set_ipv6_dns_servers(struct ofono_gprs_context *gc,
 	settings->ipv6->dns = g_strdupv((char **) dns);
 }

-void ofono_gprs_context_set_ipv6_proxy_cscf(struct ofono_gprs_context *gc,
-						const char **pcscf)
-{
-	struct context_settings *settings = gc->settings;
-
-	if (settings->ipv6 == NULL)
-		return;
-
-	g_strfreev(settings->ipv6->pcscf);
-	settings->ipv6->pcscf = g_strdupv((char **) pcscf);
-}
-
 void ofono_gprs_context_signal_change(struct ofono_gprs_context *gc,
 							unsigned int cid)
 {
@@ -3910,7 +3832,8 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
 	struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
 	const char *path = __ofono_atom_get_path(gprs->atom);

-	configure_remaining_contexts(gprs);
+	if (gprs->contexts == NULL) /* Automatic provisioning failed */
+		add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);

 	if (!g_dbus_register_interface(conn, path,
 					OFONO_CONNECTION_MANAGER_INTERFACE,
@@ -3933,14 +3856,56 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
 	__ofono_atom_register(gprs->atom, gprs_unregister);
 }

+static gboolean mms_context_configured(struct ofono_gprs *gprs)
+{
+	GSList *l;
+
+	for (l = gprs->contexts; l; l = l->next) {
+		struct pri_context *ctx = l->data;
+
+		if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_MMS)
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void provision_mms_context(struct ofono_gprs *gprs, const char *mcc,
+				const char *mnc, const char *spn)
+{
+	struct ofono_gprs_provision_data *settings;
+	int count;
+	int i;
+
+	if (__ofono_gprs_provision_get_settings(mcc, mnc, spn,
+						&settings, &count) == FALSE) {
+		ofono_warn("Provisioning failed");
+		return;
+	}
+
+	for (i = 0; i < count; i++) {
+		if (settings[i].type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
+			provision_context(&settings[i], gprs);
+			break;
+		}
+	}
+
+	__ofono_gprs_provision_free_settings(settings, count);
+}
+
 static void spn_read_cb(const char *spn, const char *dc, void *data)
 {
 	struct ofono_gprs *gprs	= data;
 	struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
 	struct ofono_sim *sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);

-	provision_contexts(gprs, ofono_sim_get_mcc(sim),
+	if (gprs->contexts == NULL) {
+		provision_contexts(gprs, ofono_sim_get_mcc(sim),
 					ofono_sim_get_mnc(sim), spn);
+	} else if (!mms_context_configured(gprs)) {
+		provision_mms_context(gprs, ofono_sim_get_mcc(sim),
+					ofono_sim_get_mnc(sim), spn);
+	}

 	ofono_sim_remove_spn_watch(sim, &gprs->spn_watch);

@@ -3962,7 +3927,7 @@ void ofono_gprs_register(struct ofono_gprs *gprs)

 	gprs_load_settings(gprs, ofono_sim_get_imsi(sim));

-	if (all_contexts_configured(gprs))
+	if (mms_context_configured(gprs))
 		goto finish;

 	ofono_sim_add_spn_watch(sim, &gprs->spn_watch, spn_read_cb, gprs, NULL);
--- a/ofono/src/main.c
+++ b/ofono/src/main.c
@@ -3,8 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2020  Jolla Ltd.
- *  Copyright (C) 2019-2020  Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -283,7 +281,7 @@ int main(int argc, char **argv)

 	dbus_error_init(&error);

-	conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, &error);
+	conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OFONO_SERVICE, &error);
 	if (conn == NULL) {
 		if (dbus_error_is_set(&error) == TRUE) {
 			ofono_error("Unable to hop onto D-Bus: %s",
@@ -310,12 +308,7 @@ int main(int argc, char **argv)
 	g_free(option_plugin);
 	g_free(option_noplugin);

-	if (g_dbus_request_name(conn, OFONO_SERVICE, &error)) {
-		g_main_loop_run(event_loop);
-	} else {
-		ofono_error("Unable to register D-Bus name: %s", error.message);
-		dbus_error_free(&error);
-	}
+	g_main_loop_run(event_loop);

 	__ofono_plugin_cleanup();

--- a/ofono/src/ofono.h
+++ b/ofono/src/ofono.h
@@ -3,7 +3,7 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
+ *  Copyright (C) 2015-2019  Jolla Ltd.
 *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -283,10 +283,6 @@ enum ofono_gprs_context_type __ofono_gprs_context_get_assigned_type(
 						struct ofono_gprs_context *gc);

 #include <ofono/radio-settings.h>
-
-enum ofono_radio_access_mode __ofono_radio_access_max_mode(
-					enum ofono_radio_access_mode modes);
-
 #include <ofono/audio-settings.h>
 #include <ofono/ctm.h>
 #include <ofono/location-reporting.h>
@@ -388,7 +384,6 @@ unsigned short __ofono_sms_get_next_ref(struct ofono_sms *sms);

 #include <ofono/sim.h>

-struct sim_aid;
 struct ofono_sim_aid_session;
 enum sim_app_type;

@@ -427,7 +422,7 @@ void __ofono_sim_remove_session_watch(struct ofono_sim_aid_session *session,
 		unsigned int id);

 struct ofono_sim_aid_session *__ofono_sim_get_session_by_aid(
-		struct ofono_sim *sim, const struct sim_aid *aid);
+		struct ofono_sim *sim, unsigned char *aid);

 struct ofono_sim_aid_session *__ofono_sim_get_session_by_type(
 		struct ofono_sim *sim, enum sim_app_type type);
@@ -437,7 +432,7 @@ int __ofono_sim_session_get_id(struct ofono_sim_aid_session *session);
 enum sim_app_type __ofono_sim_session_get_type(
 		struct ofono_sim_aid_session *session);

-const struct sim_aid *__ofono_sim_session_get_aid(
+unsigned char *__ofono_sim_session_get_aid(
 		struct ofono_sim_aid_session *session);

 const char *__ofono_sim_get_impi(struct ofono_sim *sim);
--- a/ofono/src/plugin.c
+++ b/ofono/src/plugin.c
@@ -30,8 +30,6 @@

 #include "ofono.h"

-#pragma message("PLUGINDIR="PLUGINDIR)
-
 static GSList *plugins = NULL;

 struct ofono_plugin {
--- a/ofono/src/radio-settings.c
+++ b/ofono/src/radio-settings.c
@@ -2,8 +2,7 @@
 *
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *  Copyright (C) 2014-2020 Jolla Ltd.
+ *  Copyright (C) 2010  Nokia Corporation and/or its subsidiary(-ies).
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -62,22 +61,10 @@ struct ofono_radio_settings {
 	struct ofono_atom *atom;
 };

-enum ofono_radio_access_mode __ofono_radio_access_max_mode(
-					enum ofono_radio_access_mode mask)
-{
-	return	(mask & OFONO_RADIO_ACCESS_MODE_LTE) ?
-					OFONO_RADIO_ACCESS_MODE_LTE :
-		(mask & OFONO_RADIO_ACCESS_MODE_UMTS) ?
-					OFONO_RADIO_ACCESS_MODE_UMTS :
-		(mask & OFONO_RADIO_ACCESS_MODE_GSM) ?
-					OFONO_RADIO_ACCESS_MODE_GSM :
-					OFONO_RADIO_ACCESS_MODE_ANY;
-}
-
 #define radio_access_mode_to_string ofono_radio_access_mode_to_string
 const char *ofono_radio_access_mode_to_string(enum ofono_radio_access_mode m)
 {
-	switch (__ofono_radio_access_max_mode(m)) {
+	switch (m) {
 	case OFONO_RADIO_ACCESS_MODE_ANY:
 		return "any";
 	case OFONO_RADIO_ACCESS_MODE_GSM:
@@ -89,10 +76,6 @@ const char *ofono_radio_access_mode_to_string(enum ofono_radio_access_mode m)
 	default:
 		return NULL;
 	}
-	return (m == OFONO_RADIO_ACCESS_MODE_ANY) ? "any" :
-			(m & OFONO_RADIO_ACCESS_MODE_LTE) ?  "lte" :
-			(m & OFONO_RADIO_ACCESS_MODE_UMTS) ? "umts" :
-			(m & OFONO_RADIO_ACCESS_MODE_GSM) ? "gsm" : NULL;
 }
 #define radio_access_mode_from_string ofono_radio_access_mode_from_string
 ofono_bool_t ofono_radio_access_mode_from_string(const char *str,
--- a/ofono/src/sim-auth.c
+++ b/ofono/src/sim-auth.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -63,7 +62,7 @@ struct auth_request {
 };

 struct aid_object {
-	struct sim_aid aid;
+	uint8_t aid[16];
 	char *path;
 	enum sim_app_type type;
 };
@@ -83,7 +82,7 @@ struct ofono_sim_auth {
 /*
 * Find an application by path. 'path' should be a DBusMessage object path.
 */
-static const struct aid_object *find_aid_by_path(GSList *aid_objects,
+static uint8_t *find_aid_by_path(GSList *aid_objects,
 		const char *path)
 {
 	GSList *iter = aid_objects;
@@ -92,7 +91,7 @@ static const struct aid_object *find_aid_by_path(GSList *aid_objects,
 		struct aid_object *obj = iter->data;

 		if (!strcmp(path, obj->path))
-			return obj;
+			return obj->aid;

 		iter = g_slist_next(iter);
 	}
@@ -209,10 +208,14 @@ static void handle_umts(struct ofono_sim_auth *sa, const uint8_t *resp,
 	DBusMessage *reply = NULL;
 	DBusMessageIter iter;
 	DBusMessageIter dict;
-	struct data_block res, ck, ik, auts, sres, kc;
+	const uint8_t *res = NULL;
+	const uint8_t *ck = NULL;
+	const uint8_t *ik = NULL;
+	const uint8_t *auts = NULL;
+	const uint8_t *kc = NULL;

 	if (!sim_parse_umts_authenticate(resp, len, &res, &ck, &ik,
-			&auts, &sres, &kc))
+			&auts, &kc))
 		goto umts_end;

 	reply = dbus_message_new_method_return(sa->pending->msg);
@@ -222,23 +225,15 @@ static void handle_umts(struct ofono_sim_auth *sa, const uint8_t *resp,
 	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
 			"{say}", &dict);

-	if (auts.data)
-		append_dict_byte_array(&dict, "AUTS", auts.data, auts.len);
-
-	if (sres.data)
-		append_dict_byte_array(&dict, "SRES", sres.data, sres.len);
-
-	if (res.data)
-		append_dict_byte_array(&dict, "RES", res.data, res.len);
-
-	if (ck.data)
-		append_dict_byte_array(&dict, "CK", ck.data, ck.len);
-
-	if (ik.data)
-		append_dict_byte_array(&dict, "IK", ik.data, ik.len);
-
-	if (kc.data)
-		append_dict_byte_array(&dict, "Kc", kc.data, kc.len);
+	if (auts) {
+		append_dict_byte_array(&dict, "AUTS", auts, 14);
+	} else {
+		append_dict_byte_array(&dict, "RES", res, 8);
+		append_dict_byte_array(&dict, "CK", ck, 16);
+		append_dict_byte_array(&dict, "IK", ik, 16);
+		if (kc)
+			append_dict_byte_array(&dict, "Kc", kc, 8);
+	}

 	dbus_message_iter_close_container(&iter, &dict);

@@ -373,8 +368,6 @@ static void get_session_cb(ofono_bool_t active, int session_id,
 error:
 	__ofono_dbus_pending_reply(&sa->pending->msg,
 			__ofono_error_failed(sa->pending->msg));
-	__ofono_sim_remove_session_watch(sa->pending->session,
-			sa->pending->watch_id);
 	g_free(sa->pending);
 	sa->pending = NULL;
 }
@@ -385,7 +378,7 @@ static DBusMessage *usim_gsm_authenticate(DBusConnection *conn,
 	struct ofono_sim_auth *sa = data;
 	DBusMessageIter iter;
 	DBusMessageIter array;
-	const struct aid_object *obj;
+	uint8_t *aid;

 	if (sa->pending)
 		return __ofono_error_busy(msg);
@@ -425,20 +418,13 @@ static DBusMessage *usim_gsm_authenticate(DBusConnection *conn,
 	/*
 	 * retrieve session from SIM
 	 */
-	obj = find_aid_by_path(sa->aid_objects, dbus_message_get_path(msg));
-	sa->pending->session = __ofono_sim_get_session_by_aid(sa->sim,
-						&obj->aid);
+	aid = find_aid_by_path(sa->aid_objects, dbus_message_get_path(msg));
+	sa->pending->session = __ofono_sim_get_session_by_aid(sa->sim, aid);
 	sa->pending->msg = dbus_message_ref(msg);
 	sa->pending->watch_id = __ofono_sim_add_session_watch(
 			sa->pending->session, get_session_cb, sa, NULL);

-        if (!sa->pending->watch_id) {
-            g_free(sa->pending);
-            sa->pending = NULL;
-            return __ofono_error_not_supported(msg);
-        }
-
-        return NULL;
+	return NULL;

 format_error:
 	g_free(sa->pending);
@@ -454,7 +440,7 @@ static DBusMessage *umts_common(DBusConnection *conn, DBusMessage *msg,
 	uint32_t rlen;
 	uint32_t alen;
 	struct ofono_sim_auth *sa = data;
-	const struct aid_object *obj;
+	uint8_t *aid;

 	if (sa->pending)
 		return __ofono_error_busy(msg);
@@ -479,18 +465,12 @@ static DBusMessage *umts_common(DBusConnection *conn, DBusMessage *msg,
 	/*
 	 * retrieve session from SIM
 	 */
-	obj = find_aid_by_path(sa->aid_objects, dbus_message_get_path(msg));
-	sa->pending->session = __ofono_sim_get_session_by_aid(sa->sim,
-						&obj->aid);
+	aid = find_aid_by_path(sa->aid_objects, dbus_message_get_path(msg));
+	sa->pending->session = __ofono_sim_get_session_by_aid(sa->sim, aid);
+
 	sa->pending->watch_id = __ofono_sim_add_session_watch(
 			sa->pending->session, get_session_cb, sa, NULL);

-        if (!sa->pending->watch_id) {
-            g_free(sa->pending);
-            sa->pending = NULL;
-            return __ofono_error_not_supported(msg);
-        }
-
 	return NULL;
 }

@@ -720,15 +700,14 @@ static void sim_auth_register(struct ofono_sim_auth *sa)

 			ret = sprintf(new->path, "%s/", path);

-			encode_hex_own_buf(r->aid.aid, r->aid.len, 0,
-					new->path + ret);
+			encode_hex_own_buf(r->aid, 16, 0, new->path + ret);

 			g_dbus_register_interface(conn, new->path,
 					OFONO_USIM_APPLICATION_INTERFACE,
 					sim_auth_usim_app, NULL, NULL,
 					sa, NULL);

-			new->aid = r->aid;
+			memcpy(new->aid, r->aid, 16);

 			break;
 		case SIM_APP_TYPE_ISIM:
@@ -736,15 +715,14 @@ static void sim_auth_register(struct ofono_sim_auth *sa)

 			ret = sprintf(new->path, "%s/", path);

-			encode_hex_own_buf(r->aid.aid, r->aid.len, 0,
-					new->path + ret);
+			encode_hex_own_buf(r->aid, 16, 0, new->path + ret);

 			g_dbus_register_interface(conn, new->path,
 					OFONO_ISIM_APPLICATION_INTERFACE,
 					sim_auth_isim_app, NULL, NULL,
 					sa, NULL);

-			new->aid = r->aid;
+			memcpy(new->aid, r->aid, 16);

 			break;
 		default:
--- a/ofono/src/sim.c
+++ b/ofono/src/sim.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -2442,7 +2441,7 @@ struct ofono_sim_context *ofono_sim_context_create_isim(

 		if (session->record->type == SIM_APP_TYPE_ISIM) {
 			return sim_fs_context_new_with_aid(sim->simfs_isim,
-					&session->record->aid);
+					session->record->aid);
 		}

 		iter = g_slist_next(iter);
@@ -3668,26 +3667,6 @@ const char *__ofono_sim_get_impi(struct ofono_sim *sim)
 static void open_channel_cb(const struct ofono_error *error, int session_id,
 		void *data);

-static gboolean open_channel(struct ofono_sim_aid_session *session)
-{
-	struct ofono_sim *sim = session->sim;
-	const struct ofono_sim_driver *driver = sim->driver;
-	const struct sim_aid *aid = &session->record->aid;
-
-	if (driver->open_channel2) {
-		driver->open_channel2(sim, aid->aid, aid->len, open_channel_cb,
-								session);
-		return TRUE;
-	}
-
-	if (driver->open_channel && aid->len == 16) {
-		driver->open_channel(sim, aid->aid, open_channel_cb, session);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
 static void close_channel_cb(const struct ofono_error *error, void *data)
 {
 	struct ofono_sim_aid_session *session = data;
@@ -3701,8 +3680,10 @@ static void close_channel_cb(const struct ofono_error *error, void *data)
 		 * An atom requested to open during a close, we can re-open
 		 * here.
 		 */
-		if (open_channel(session))
-			return;
+		session->sim->driver->open_channel(session->sim,
+				session->record->aid, open_channel_cb,
+				session);
+		return;
 	}

 	session->state = SESSION_STATE_INACTIVE;
@@ -3777,12 +3758,10 @@ unsigned int __ofono_sim_add_session_watch(
 		 * If the session is inactive and there are no watchers, open
 		 * a new session.
 		 */
-		if (open_channel(session)) {
-			session->state = SESSION_STATE_OPENING;
-		} else {
-			g_free(item);
-			return 0;
-		}
+		session->state = SESSION_STATE_OPENING;
+		session->sim->driver->open_channel(session->sim,
+				session->record->aid, open_channel_cb,
+				session);
 	} else if (session->state == SESSION_STATE_OPEN) {
 		/*
 		 * Session is already open and available, just call the
@@ -3805,8 +3784,7 @@ void __ofono_sim_remove_session_watch(struct ofono_sim_aid_session *session,
 {
 	__ofono_watchlist_remove_item(session->watches, id);

-	if (g_slist_length(session->watches->items) == 0 &&
-			session->state == SESSION_STATE_OPEN) {
+	if (g_slist_length(session->watches->items) == 0) {
 		/* last watcher, close session */
 		session->state = SESSION_STATE_CLOSING;
 		session->sim->driver->close_channel(session->sim,
@@ -3815,15 +3793,14 @@ void __ofono_sim_remove_session_watch(struct ofono_sim_aid_session *session,
 }

 struct ofono_sim_aid_session *__ofono_sim_get_session_by_aid(
-		struct ofono_sim *sim, const struct sim_aid *aid)
+		struct ofono_sim *sim, unsigned char *aid)
 {
 	GSList *iter = sim->aid_sessions;

 	while (iter) {
 		struct ofono_sim_aid_session *session = iter->data;

-		if (session->record->aid.len == aid->len &&
-			!memcmp(session->record->aid.aid, aid->aid, aid->len))
+		if (!memcmp(session->record->aid, aid, 16))
 			return session;

 		iter = g_slist_next(iter);
@@ -3860,10 +3837,10 @@ enum sim_app_type __ofono_sim_session_get_type(
 	return session->record->type;
 }

-const struct sim_aid *__ofono_sim_session_get_aid(
+unsigned char *__ofono_sim_session_get_aid(
 		struct ofono_sim_aid_session *session)
 {
-	return &session->record->aid;
+	return session->record->aid;
 }

 GSList *__ofono_sim_get_aid_list(struct ofono_sim *sim)
--- a/ofono/src/simfs.c
+++ b/ofono/src/simfs.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -165,7 +164,7 @@ struct ofono_sim_context *sim_fs_context_new(struct sim_fs *fs)
 }

 struct ofono_sim_context *sim_fs_context_new_with_aid(struct sim_fs *fs,
-		const struct sim_aid *aid)
+		unsigned char *aid)
 {
 	struct ofono_sim_context *context = sim_fs_context_new(fs);

--- a/ofono/src/simfs.h
+++ b/ofono/src/simfs.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -21,7 +20,6 @@
 */

 struct sim_fs;
-struct sim_aid;

 typedef void (*sim_fs_read_info_cb_t)(int ok, unsigned char file_status,
 					int total_length, int record_length,
@@ -32,7 +30,7 @@ struct sim_fs *sim_fs_new(struct ofono_sim *sim,
 struct ofono_sim_context *sim_fs_context_new(struct sim_fs *fs);

 struct ofono_sim_context *sim_fs_context_new_with_aid(struct sim_fs *fs,
-		const struct sim_aid *aid);
+		unsigned char *aid);

 unsigned int sim_fs_file_watch_add(struct ofono_sim_context *context,
 					int id, ofono_sim_file_changed_cb_t cb,
--- a/ofono/src/simutil.c
+++ b/ofono/src/simutil.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -1420,7 +1419,7 @@ gboolean sim_parse_3g_get_response(const unsigned char *data, int len,
 	if (tlv[1] != 0x21)
 		return FALSE;

-	switch (tlv[0] & 0x7) {
+	switch (tlv[0] & 0x3) {
 	case 1:	/* Transparent */
 		str = 0x00;
 		break;
@@ -1573,17 +1572,20 @@ GSList *sim_parse_app_template_entries(const unsigned char *buffer, int len)
 	/* Find all the application entries */
 	while ((dataobj = ber_tlv_find_by_tag(buffer, 0x61, len,
 						&dataobj_len)) != NULL) {
-		struct sim_app_record *app;
+		struct sim_app_record app;
 		const unsigned char *aid, *label;
-		int label_len, aid_len;
-		char *app_label;
+		int label_len;

 		/* Find the aid (mandatory) */
 		aid = ber_tlv_find_by_tag(dataobj, 0x4f, dataobj_len,
-						&aid_len);
-		if (!aid || aid_len < 0x01 || aid_len > 0x10)
+						&app.aid_len);
+		if (!aid || app.aid_len < 0x01 || app.aid_len > 0x10)
 			goto error;

+		memcpy(app.aid, aid, app.aid_len);
+
+		app.type = (app.aid[5] << 8) | app.aid[6];
+
 		/* Find the label (optional) */
 		label = ber_tlv_find_by_tag(dataobj, 0x50, dataobj_len,
 						&label_len);
@@ -1592,21 +1594,14 @@ GSList *sim_parse_app_template_entries(const unsigned char *buffer, int len)
 			 * Label field uses the extra complicated
 			 * encoding in 102.221 Annex A
 			 */
-			app_label = sim_string_to_utf8(label, label_len);
+			app.label = sim_string_to_utf8(label, label_len);

-			if (app_label == NULL)
+			if (app.label == NULL)
 				goto error;
 		} else
-			app_label = NULL;
+			app.label = NULL;

-		app = g_new0(struct sim_app_record, 1);
-
-		memcpy(app->aid.aid, aid, aid_len);
-		app->aid.len = aid_len;
-		app->label = app_label;
-		app->type = (aid[5] << 8) | aid[6];
-
-		ret = g_slist_prepend(ret, app);
+		ret = g_slist_prepend(ret, g_memdup(&app, sizeof(app)));

 		len -= (dataobj - buffer) + dataobj_len;
 		buffer = dataobj + dataobj_len;
@@ -1672,135 +1667,67 @@ int sim_build_gsm_authenticate(unsigned char *buffer, int len,
 	return build_authenticate(buffer, rand, NULL);
 }

-gboolean sim_parse_umts_authenticate(const unsigned char *buffer, int len,
-		struct data_block *res, struct data_block *ck,
-		struct data_block *ik, struct data_block *auts,
-		struct data_block *sres, struct data_block *kc)
+gboolean sim_parse_umts_authenticate(const unsigned char *buffer,
+		int len, const unsigned char **res, const unsigned char **ck,
+		const unsigned char **ik, const unsigned char **auts,
+		const unsigned char **kc)
 {
-	const unsigned char *ptr = buffer;
-	const unsigned char *end = ptr + len;
-	unsigned int l;
-
-	if (!buffer || len < 2)
+	if (len < 16 || !buffer)
 		return FALSE;

-	memset(res, 0, sizeof(*res));
-	memset(ck, 0, sizeof(*ck));
-	memset(ik, 0, sizeof(*ik));
-	memset(kc, 0, sizeof(*kc));
-	memset(auts, 0, sizeof(*auts));
-	memset(sres, 0, sizeof(*sres));
-
-	/*
-	 * TS 31.102
-	 * 7.1.2.1 GSM/3G security context
-	 */
-	switch (*ptr++) {
+	switch (buffer[0]) {
 	case 0xdb:
-		/*
-		 * Response parameters/data, case 1, 3G security context,
-		 * command successful:
-		 *
-		 * "Successful 3G authentication" tag = 'DB'
-		 * 'DB' + L3 + RES(L3) + L4 + CK(L4) + L5 + IK(L5) + 8 + Kc(8)
-		 */
-		l = *ptr++; /* L3 */
-		if ((ptr + l) > end)
-			return FALSE;
+		/* 'DB' + '08' + RES(16) + '10' + CK(32) + '10' + IK(32) = 43 */
+		if (len < 43)
+			goto umts_end;

-		res->data = ptr;
-		res->len = l;
-		ptr += l;
+		/* success */
+		if (buffer[1] != 0x08)
+			goto umts_end;

-		if (ptr == end)
-			return FALSE;
+		*res = buffer + 2;

-		l = *ptr++; /* L4 */
-		if ((ptr + l) > end)
-			return FALSE;
+		if (buffer[10] != 0x10)
+			goto umts_end;

-		ck->data = ptr;
-		ck->len = l;
-		ptr += l;
+		*ck = buffer + 11;

-		if (ptr == end)
-			return FALSE;
+		if (buffer[27] != 0x10)
+			goto umts_end;

-		l = *ptr++; /* L5 */
-		if ((ptr + l) > end)
-			return FALSE;
+		*ik = buffer + 28;

-		ik->data = ptr;
-		ik->len = l;
-		ptr += l;
+		if (len >= 53 && kc) {
+			if (buffer[44] != 0x08)
+				goto umts_end;

-		if (ptr < end) {
-			l = *ptr++;
-			if (l != 8 || (ptr + l) != end)
-				return FALSE;
-
-			kc->data = ptr;
-			kc->len = l;
-			ptr += l;
+			*kc = buffer + 45;
+		} else {
+			*kc = NULL;
 		}

-		return TRUE;
+		*auts = NULL;

-	case 0xdc:
-		/*
-		 * Response parameters/data, case 2, 3G security context,
-		 * synchronisation failure:
-		 *
-		 * "Synchronisation failure" tag = 'DC'
-		 * 'DC' + L1 + AUTS(L1)
-		 */
-		l = *ptr++; /* L1 */
-		if ((ptr + l) > end)
-			return FALSE;
-
-		auts->data = ptr;
-		auts->len = l;
-		ptr += l;
-
-		if (ptr != end)
-			return FALSE;
-
-		return TRUE;
-
-	case 0x04:
-		/*
-		 * Response parameters/data, case 3, GSM security context,
-		 * command successful:
-		 *
-		 * 4 + SRES(4) + 8 + Kc(8)
-		 */
-		l = 4; /* Already skipped this one */
-		if ((ptr + l) > end)
-			return FALSE;
-
-		sres->data = ptr;
-		sres->len = l;
-		ptr += l;
-
-		if (ptr == end)
-			return FALSE;
-
-		l = *ptr++; /* 8 */
-		if (l != 8 || (ptr + l) > end)
-			return FALSE;
-
-		kc->data = ptr;
-		kc->len = l;
-		ptr += l;
-
-		if (ptr != end)
-			return FALSE;
-
-		return TRUE;
-
-	default:
 		break;
+	case 0xdc:
+		/* 'DC' + '0E' + AUTS(14) = 16 */
+		if (len < 16)
+			goto umts_end;
+
+		/* sync error */
+		if (buffer[1] != 0x0e)
+			goto umts_end;
+
+		*auts = buffer + 2;
+
+		break;
+	default:
+		goto umts_end;
 	}
+
+	return TRUE;
+
+umts_end:
 	return FALSE;
 }

--- a/ofono/src/simutil.h
+++ b/ofono/src/simutil.h
@@ -314,13 +314,9 @@ struct sim_ef_info {
 	enum sim_file_access perm_update;
 };

-struct sim_aid {
-	unsigned char aid[16];
-	unsigned int len;
-};
-
 struct sim_app_record {
-	struct sim_aid aid;
+	unsigned char aid[16];
+	int aid_len;
 	char *label;
 	enum sim_app_type type;
 };
@@ -375,11 +371,6 @@ struct comprehension_tlv_builder {
 	struct ber_tlv_builder *parent;
 };

-struct data_block {
-	const unsigned char *data;
-	unsigned int len;
-};
-
 void simple_tlv_iter_init(struct simple_tlv_iter *iter,
 				const unsigned char *pdu, unsigned int len);
 gboolean simple_tlv_iter_next(struct simple_tlv_iter *iter);
@@ -535,10 +526,10 @@ int sim_build_umts_authenticate(unsigned char *buffer, int len,
 int sim_build_gsm_authenticate(unsigned char *buffer, int len,
 		const unsigned char *rand);

-gboolean sim_parse_umts_authenticate(const unsigned char *buffer, int len,
-		struct data_block *res, struct data_block *ck,
-		struct data_block *ik, struct data_block *auts,
-		struct data_block *sres, struct data_block *kc);
+gboolean sim_parse_umts_authenticate(const unsigned char *buffer,
+		int len, const unsigned char **res, const unsigned char **ck,
+		const unsigned char **ik, const unsigned char **auts,
+		const unsigned char **kc);

 gboolean sim_parse_gsm_authenticate(const unsigned char *buffer, int len,
 		const unsigned char **sres, const unsigned char **kc);
--- a/ofono/src/smsutil.c
+++ b/ofono/src/smsutil.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2020  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -1758,7 +1757,7 @@ gboolean sms_udh_iter_init_from_cbs(const struct cbs *cbs,
 		return FALSE;

 	hdr = cbs->ud;
-	max_ud_len = cbs->udlen;
+	max_ud_len = 82;

 	/* Must have at least one information-element if udhi is true */
 	if (hdr[0] < 2)
@@ -3857,8 +3856,8 @@ gboolean cbs_dcs_decode(guint8 dcs, gboolean *udhi, enum sms_class *cls,

 gboolean cbs_decode(const unsigned char *pdu, int len, struct cbs *out)
 {
-	/* CBS is (almost) always a fixed length of 88 bytes */
-	if (len < 6 || len > 88)
+	/* CBS is always a fixed length of 88 bytes */
+	if (len != 88)
 		return FALSE;

 	out->gs = (enum cbs_geo_scope) ((pdu[0] >> 6) & 0x03);
@@ -3869,10 +3868,6 @@ gboolean cbs_decode(const unsigned char *pdu, int len, struct cbs *out)
 	out->max_pages = pdu[5] & 0xf;
 	out->page = (pdu[5] >> 4) & 0xf;

-	/* Allow the last fragment to be truncated */
-	if (len != 88 && out->max_pages != out->page)
-		return FALSE;
-
 	/*
 	 * If a mobile receives the code 0000 in either the first field or
 	 * the second field then it shall treat the CBS message exactly the
@@ -3884,10 +3879,7 @@ gboolean cbs_decode(const unsigned char *pdu, int len, struct cbs *out)
 		out->page = 1;
 	}

-	out->udlen = (guint8)(len - 6);
-	memcpy(out->ud, pdu + 6, out->udlen);
-	if (out->udlen < 82)
-		memset(out->ud + out->udlen, 0, 82 - out->udlen);
+	memcpy(out->ud, pdu + 6, 82);

 	return TRUE;
 }
@@ -4080,7 +4072,7 @@ char *cbs_decode_text(GSList *cbs_list, char *iso639_lang)
 			if (iso639)
 				bufsize -= 3;
 		} else {
-			bufsize += cbs->udlen;
+			bufsize += 82;

 			if (iso639)
 				bufsize -= 2;
@@ -4097,7 +4089,7 @@ char *cbs_decode_text(GSList *cbs_list, char *iso639_lang)
 			if (sms_udh_iter_init_from_cbs(cbs, &iter))
 				taken = sms_udh_iter_get_udh_length(&iter) + 1;

-			unpack_7bit_own_buf(cbs->ud + taken, cbs->udlen - taken,
+			unpack_7bit_own_buf(cbs->ud + taken, 82 - taken,
 						taken, FALSE, 2,
 						NULL, 0,
 						(unsigned char *)iso639_lang);
@@ -4130,7 +4122,7 @@ char *cbs_decode_text(GSList *cbs_list, char *iso639_lang)
 			max_chars =
 				sms_text_capacity_gsm(CBS_MAX_GSM_CHARS, taken);

-			unpack_7bit_own_buf(ud + taken, cbs->udlen - taken,
+			unpack_7bit_own_buf(ud + taken, 82 - taken,
 						taken, FALSE, max_chars,
 						&written, 0, unpacked);

@@ -4164,7 +4156,7 @@ char *cbs_decode_text(GSList *cbs_list, char *iso639_lang)
 			 * the check here since the specification isn't clear
 			 */
 		} else {
-			int num_ucs2_chars = (cbs->udlen - taken) >> 1;
+			int num_ucs2_chars = (82 - taken) >> 1;
 			int i = taken;
 			int max_offset = taken + num_ucs2_chars * 2;

--- a/ofono/src/smsutil.h
+++ b/ofono/src/smsutil.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2020  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -399,7 +398,6 @@ struct cbs {
 	guint8 dcs;				/* 8 bits */
 	guint8 max_pages;			/* 4 bits */
 	guint8 page;				/* 4 bits */
-	guint8 udlen;
 	guint8 ud[82];
 };

--- a/ofono/src/voicecall.c
+++ b/ofono/src/voicecall.c
@@ -349,12 +349,12 @@ static int tone_queue(struct ofono_voicecall *vc, const char *tone_str,

 	/*
 	 * Tones can be 0-9, *, #, A-D according to 27.007 C.2.11,
-	 * and p for Pause (also , for Pause as per ITU-T V.250 6.3.1.2).
+	 * and p for Pause.
 	 */
 	for (i = 0; tone_str[i]; i++)
 		if (!g_ascii_isdigit(tone_str[i]) && tone_str[i] != 'p' &&
 				tone_str[i] != 'P' && tone_str[i] != '*' &&
-				tone_str[i] != ',' &&
+				tone_str[i] != '.' && tone_str[i] != ',' &&
 				tone_str[i] != '#' && (tone_str[i] < 'A' ||
 				tone_str[i] > 'D'))
 			return -EINVAL;
@@ -4389,7 +4389,7 @@ static void tone_request_cb(const struct ofono_error *error, void *data)
 		goto done;
 	}

-	len = strspn(entry->left, "pP,");
+	len = strspn(entry->left, "pP.,");
 	entry->left += len;

 done:
@@ -4423,7 +4423,7 @@ static gboolean tone_request_run(gpointer user_data)
 	if (entry == NULL)
 		return FALSE;

-	len = strcspn(entry->left, "pP,");
+	len = strcspn(entry->left, "pP.,");

 	if (len) {
 		if (len > 8) /* Arbitrary length limit per request */
--- a/ofono/unit/coverage
+++ b/ofono/unit/coverage
@@ -18,7 +18,6 @@ TESTS="\
 test-caif \
 test-dbus-queue \
 test-dbus-access \
- test-dbus-clients \
 test-gprs-filter \
 test-provision \
 test-config \
--- a/ofono/unit/test-dbus-access.c
+++ b/ofono/unit/test-dbus-access.c
@@ -34,12 +34,6 @@ static enum ofono_dbus_access deny_method_access(const char *sender,
 	return OFONO_DBUS_ACCESS_DENY;
 }

-static enum ofono_dbus_access broken_method_access(const char *sender,
-	enum ofono_dbus_access_intf intf, int method, const char *arg)
-{
-	return (enum ofono_dbus_access)(-1);
-}
-
 struct ofono_dbus_access_plugin access_inval;
 struct ofono_dbus_access_plugin access_dontcare = {
 	.name = "DontCare",
@@ -57,12 +51,6 @@ struct ofono_dbus_access_plugin access_deny = {
 	.method_access = deny_method_access
 };

-struct ofono_dbus_access_plugin access_broken = {
-	.name = "Broken",
-	.priority = OFONO_DBUS_ACCESS_PRIORITY_LOW,
-	.method_access = broken_method_access
-};
-
 /*==========================================================================*
 * Tests
 *==========================================================================*/
@@ -119,9 +107,6 @@ static const struct test_method_name_data method_name_tests[] = {
 	},{
 		OFONO_DBUS_ACCESS_INTF_STK,
 		OFONO_DBUS_ACCESS_STK_METHOD_COUNT
-	},{
-		OFONO_DBUS_ACCESS_INTF_OEMRAW,
-		OFONO_DBUS_ACCESS_OEMRAW_METHOD_COUNT
 	}
 };

@@ -171,13 +156,6 @@ static void test_register()
 	ofono_dbus_access_plugin_unregister(&access_deny);
 	ofono_dbus_access_plugin_unregister(&access_dontcare);

-	/* And here too */
-	g_assert(!ofono_dbus_access_plugin_register(&access_broken));
-	g_assert(!ofono_dbus_access_plugin_register(&access_deny));
-	g_assert(!__ofono_dbus_access_method_allowed(":1.0", 0, 1, NULL));
-	ofono_dbus_access_plugin_unregister(&access_deny);
-	ofono_dbus_access_plugin_unregister(&access_dontcare);
-
 	/* DontCare will allow everything */
 	g_assert(!ofono_dbus_access_plugin_register(&access_dontcare));
 	g_assert(__ofono_dbus_access_method_allowed(":1.0", 0, 1, NULL));
--- a/ofono/unit/test-dbus-clients.c
+++ b/ofono/unit/test-dbus-clients.c
@@ -1,280 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2021 Jolla Ltd. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#include "test-dbus.h"
-
-#include <ofono/dbus-clients.h>
-#include <ofono/dbus.h>
-#include <ofono/log.h>
-#include "ofono.h"
-
-#include <gutil_log.h>
-#include <gutil_macros.h>
-
-#include <errno.h>
-
-#define TEST_TIMEOUT                    (10)   /* seconds */
-#define TEST_SENDER                     ":1.0"
-#define TEST_SENDER_1                   ":1.1"
-
-#define TEST_DBUS_PATH                  "/test"
-#define TEST_DBUS_INTERFACE             "test.interface"
-#define TEST_PROPERTY_CHANGED_SIGNAL    "PropertyChanged"
-#define TEST_PROPERTY_NAME              "Test"
-#define TEST_PROPERTY_VALUE             "test"
-
-struct test_data {
-	struct test_dbus_context dbus;
-	struct ofono_dbus_clients *clients;
-	int count;
-};
-
-static gboolean test_debug;
-
-/* ==== dummy interface ==== */
-
-#define test_register_interface(methods,signals,data) \
-	g_assert(g_dbus_register_interface(ofono_dbus_get_connection(), \
-				TEST_DBUS_PATH, TEST_DBUS_INTERFACE, \
-				methods, signals, NULL, data, NULL))
-
-#define test_register_dummy_interface() \
-	test_register_interface(test_dummy_methods, \
-				test_property_change_signal, NULL)
-
-static DBusMessage *test_dummy_handler(DBusConnection *conn,
-					DBusMessage *msg, void *data)
-{
-	g_assert_not_reached();
-	return NULL;
-}
-
-static const GDBusMethodTable test_dummy_methods[] = {
-	{ GDBUS_ASYNC_METHOD("Dummy", NULL, NULL, test_dummy_handler) },
-	{ }
-};
-
-static const GDBusSignalTable test_property_change_signal[] = {
-	{ GDBUS_SIGNAL("PropertyChanged",
-			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
-	{ }
-};
-
-/* ==== common ==== */
-
-static gboolean test_timeout(gpointer param)
-{
-	g_assert(!"TIMEOUT");
-	return G_SOURCE_REMOVE;
-}
-
-static guint test_setup_timeout(void)
-{
-	if (test_debug) {
-		return 0;
-	} else {
-		return g_timeout_add_seconds(TEST_TIMEOUT, test_timeout, NULL);
-	}
-}
-
-static gboolean test_loop_quit(gpointer data)
-{
-	g_main_loop_quit(data);
-	return G_SOURCE_REMOVE;
-}
-
-static void test_loop_quit_later(GMainLoop *loop)
-{
-	g_idle_add(test_loop_quit, loop);
-}
-
-/* ==== null ==== */
-
-static void test_null(void)
-{
-	/* We are NULL tolerant: */
-	ofono_dbus_clients_free(NULL);
-	ofono_dbus_clients_signal(NULL, NULL);
-	ofono_dbus_clients_signal_property_changed(NULL,NULL,NULL,NULL,0,NULL);
-	g_assert(!ofono_dbus_clients_new(NULL, NULL, NULL));
-	g_assert(!ofono_dbus_clients_count(NULL));
-	g_assert(!ofono_dbus_clients_add(NULL, NULL));
-	g_assert(!ofono_dbus_clients_remove(NULL, NULL));
-}
-
-/* ==== basic ==== */
-
-static void test_basic_notify_func(const char *name, void *loop)
-{
-	g_assert_cmpstr(name, == ,TEST_SENDER);
-	g_main_loop_quit(loop);
-}
-
-static void test_basic_start(struct test_dbus_context *dbus)
-{
-	struct test_data *test = G_CAST(dbus, struct test_data, dbus);
-	const char *value = TEST_PROPERTY_VALUE;
-	DBusMessage *signal =
-		ofono_dbus_signal_new_property_changed(TEST_DBUS_PATH,
-			TEST_DBUS_INTERFACE, TEST_PROPERTY_NAME,
-			DBUS_TYPE_STRING, &value);
-
-	test->clients = ofono_dbus_clients_new(ofono_dbus_get_connection(),
-				test_basic_notify_func, test->dbus.loop);
-
-	g_assert(!ofono_dbus_clients_add(test->clients, NULL));
-	g_assert(ofono_dbus_clients_add(test->clients, TEST_SENDER));
-	g_assert(ofono_dbus_clients_remove(test->clients, TEST_SENDER));
-	g_assert(!ofono_dbus_clients_remove(test->clients, TEST_SENDER));
-
-	/* OK to add the same thing twice */
-	g_assert(ofono_dbus_clients_add(test->clients, TEST_SENDER));
-	g_assert(ofono_dbus_clients_add(test->clients, TEST_SENDER));
-	g_assert_cmpuint(ofono_dbus_clients_count(test->clients), == ,1);
-	test_dbus_watch_disconnect_all();
-	g_assert_cmpuint(ofono_dbus_clients_count(test->clients), == ,0);
-
-	/* There's nothing to remove */
-	g_assert(!ofono_dbus_clients_remove(test->clients, TEST_SENDER));
-	g_assert(!ofono_dbus_clients_remove(test->clients, NULL));
-
-	/* These have no effect because client list is empty: */
-	ofono_dbus_clients_signal(test->clients, NULL);
-	ofono_dbus_clients_signal(test->clients, signal);
-	ofono_dbus_clients_signal_property_changed(test->clients, NULL, NULL,
-							NULL, 0, NULL);
-	ofono_dbus_clients_signal_property_changed(test->clients,
-				TEST_DBUS_PATH, TEST_DBUS_INTERFACE,
-				TEST_PROPERTY_NAME, DBUS_TYPE_STRING, &value);
-
-	/* test_basic_notify_func() has called test_loop_quit_later() */
-	dbus_message_unref(signal);
-}
-
-static void test_basic(void)
-{
-	struct test_data test;
-	guint timeout = test_setup_timeout();
-
-	memset(&test, 0, sizeof(test));
-	test_dbus_setup(&test.dbus);
-	test.dbus.start = test_basic_start;
-
-	g_main_loop_run(test.dbus.loop);
-
-	g_assert(test.clients);
-	ofono_dbus_clients_free(test.clients);
-	test_dbus_shutdown(&test.dbus);
-	if (timeout) {
-		g_source_remove(timeout);
-	}
-}
-
-/* ==== signal ==== */
-
-static void test_signal_handle(struct test_dbus_context *dbus, DBusMessage *msg)
-{
-	struct test_data *test = G_CAST(dbus, struct test_data, dbus);
-
-	g_assert_cmpstr(dbus_message_get_path(msg), == ,TEST_DBUS_PATH);
-	g_assert_cmpstr(dbus_message_get_interface(msg), == ,
-						TEST_DBUS_INTERFACE);
-	g_assert_cmpstr(dbus_message_get_member(msg), == ,
-						TEST_PROPERTY_CHANGED_SIGNAL);
-	test->count++;
-	if (test->count == 2) {
-		test_loop_quit_later(dbus->loop);
-	}
-}
-
-static void test_signal_start(struct test_dbus_context *dbus)
-{
-	struct test_data *test = G_CAST(dbus, struct test_data, dbus);
-	const char *value = TEST_PROPERTY_VALUE;
-
-	test_register_dummy_interface();
-	test->clients = ofono_dbus_clients_new(ofono_dbus_get_connection(),
-								NULL, NULL);
-
-	g_assert(ofono_dbus_clients_add(test->clients, TEST_SENDER));
-	g_assert(ofono_dbus_clients_add(test->clients, TEST_SENDER_1));
-	g_assert_cmpuint(ofono_dbus_clients_count(test->clients), == ,2);
-
-	ofono_dbus_clients_signal_property_changed(test->clients,
-				TEST_DBUS_PATH, TEST_DBUS_INTERFACE,
-				TEST_PROPERTY_NAME, DBUS_TYPE_STRING, &value);
-	/* And wait for 2 signals to arrive */
-}
-
-static void test_signal(void)
-{
-	struct test_data test;
-	guint timeout = test_setup_timeout();
-
-	memset(&test, 0, sizeof(test));
-	test_dbus_setup(&test.dbus);
-	test.dbus.start = test_signal_start;
-	test.dbus.handle_signal = test_signal_handle;
-
-	g_main_loop_run(test.dbus.loop);
-
-	g_assert_cmpuint(ofono_dbus_clients_count(test.clients), == ,2);
-	test_dbus_watch_disconnect_all();
-	g_assert_cmpuint(ofono_dbus_clients_count(test.clients), == ,0);
-	ofono_dbus_clients_free(test.clients);
-
-	test_dbus_shutdown(&test.dbus);
-	if (timeout) {
-		g_source_remove(timeout);
-	}
-}
-
-#define TEST_(name) "/dbus-clients/" name
-
-int main(int argc, char *argv[])
-{
-	int i;
-
-	g_test_init(&argc, &argv, NULL);
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
-		if (!strcmp(arg, "-d") || !strcmp(arg, "--debug")) {
-			test_debug = TRUE;
-		} else {
-			GWARN("Unsupported command line option %s", arg);
-		}
-	}
-
-	gutil_log_timestamp = FALSE;
-	gutil_log_default.level = g_test_verbose() ?
-		GLOG_LEVEL_VERBOSE : GLOG_LEVEL_NONE;
-	__ofono_log_init("test-dbus-clients",
-				g_test_verbose() ? "*" : NULL,
-				FALSE, FALSE);
-
-	g_test_add_func(TEST_("null"), test_null);
-	g_test_add_func(TEST_("basic"), test_basic);
-	g_test_add_func(TEST_("signal"), test_signal);
-
-	return g_test_run();
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/unit/test-dbus-queue.c
+++ b/ofono/unit/test-dbus-queue.c
@@ -417,7 +417,7 @@ static void test_reply_last_reply(DBusPendingCall *call, void *dbus)
 		G_CAST(dbus, struct test_reply_data, dbus);

 	DBG("");
-	test_dbus_check_empty_reply(call, NULL);
+	test_dbus_check_error_reply(call, TEST_ERROR_FAILED);
 	g_main_loop_quit(test->dbus.loop);
 }

@@ -445,12 +445,6 @@ static DBusMessage *test_reply_4(DBusMessage *msg, void *data)
 	return NULL;
 }

-static DBusMessage *test_reply_5(DBusMessage *msg, void *data)
-{
-	DBG("");
-	return dbus_message_new_method_return(msg);
-}
-
 static DBusMessage *test_reply_handler(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
@@ -491,17 +485,10 @@ static DBusMessage *test_reply_handler(DBusConnection *conn,
 	case 6:
 		__ofono_dbus_queue_request(test->queue, test_reply_4,
 								msg, NULL);
-		break;
-	case 7:
-		/* Call the same method again */
 		__ofono_dbus_queue_request(test->queue, test_reply_4,
 								msg, NULL);
 		break;
-	case 8:
-		/* Call the last one */
-		__ofono_dbus_queue_request(test->queue, test_reply_5,
-								msg, NULL);
-
+	case 7:
 		/* This completes the first one, with NULL handler */
 		__ofono_dbus_queue_reply_all_fn_param(test->queue, NULL, NULL);
 		g_assert(__ofono_dbus_queue_pending(test->queue));
@@ -521,12 +508,10 @@ static DBusMessage *test_reply_handler(DBusConnection *conn,
 		/* This one test_reply_3 with Failed */
 		__ofono_dbus_queue_reply_all_error(test->queue, NULL);

-		/* This one completes all test_reply_4 with NotSupported */
+		/* This one test_reply_4 with NotSupported */
 		error.type = OFONO_ERROR_TYPE_ERRNO;
 		error.error = -EOPNOTSUPP;
 		__ofono_dbus_queue_reply_all_error(test->queue, &error);
-
-		/* test_reply_5 must be already completed */
 		g_assert(!__ofono_dbus_queue_pending(test->queue));

 		/* And this one does nothing */
@@ -556,8 +541,7 @@ static void test_reply_start(struct test_dbus_context *dbus)
 	test_client_call(dbus, 4, test_dbus_expect_empty_reply);
 	test_client_call(dbus, 5, test_expect_failed);
 	test_client_call(dbus, 6, test_expect_not_supported);
-	test_client_call(dbus, 7, test_expect_not_supported);
-	test_client_call(dbus, 8, test_reply_last_reply);
+	test_client_call(dbus, 7, test_reply_last_reply);
 }

 static void test_reply(void)
--- a/ofono/unit/test-dbus.c
+++ b/ofono/unit/test-dbus.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2018-2021 Jolla Ltd.
+ *  Copyright (C) 2018-2019 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -133,13 +133,6 @@ guint g_dbus_add_signal_watch(DBusConnection *connection, const char *sender,
    return test_dbus_add_watch(connection, NULL, destroy, user_data);
 }

-guint g_dbus_add_disconnect_watch(DBusConnection *connection, const char *name,
-		GDBusWatchFunction func, void *user_data,
-		GDBusDestroyFunction destroy)
-{
-	return test_dbus_add_watch(connection, func, destroy, user_data);
-}
-
 gboolean g_dbus_remove_watch(DBusConnection *connection, guint id)
 {
 	struct test_dbus_watch *prev = NULL;
@@ -310,9 +303,6 @@ static DBusHandlerResult test_dbus_client_message_cb(DBusConnection *conn,
 						dbus_message_get_path(msg));
 		test->client_signals = g_slist_append(test->client_signals,
 						dbus_message_ref(msg));
-		if (test->handle_signal) {
-			test->handle_signal(test, msg);
-		}
 		return DBUS_HANDLER_RESULT_HANDLED;
 	} else {
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
--- a/ofono/unit/test-dbus.h
+++ b/ofono/unit/test-dbus.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2018-2021 Jolla Ltd.
+ *  Copyright (C) 2018 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -25,7 +25,6 @@ struct test_dbus_context {
 	DBusConnection *client_connection;
 	GSList* client_signals;
 	void (*start)(struct test_dbus_context *test);
-	void (*handle_signal)(struct test_dbus_context *test, DBusMessage *msg);
 	guint timeout_id;
 };

--- a/ofono/unit/test-provision.c
+++ b/ofono/unit/test-provision.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2014-2020 Jolla. All rights reserved.
+ *  Copyright (C) 2014-2017 Jolla. All rights reserved.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -105,21 +105,21 @@ static void test_provision(gconstpointer test_data)

 			g_assert(actual->type == expected->type);
 			g_assert(actual->proto == expected->proto);
-			g_assert_cmpstr(actual->provider_name, ==,
-						expected->provider_name);
-			g_assert_cmpstr(actual->name, ==, expected->name);
+			g_assert(!g_strcmp0(actual->provider_name,
+						expected->provider_name));
+			g_assert(!g_strcmp0(actual->name, expected->name));
 			g_assert(actual->provider_primary ==
 						expected->provider_primary);
-			g_assert_cmpstr(actual->apn, ==, expected->apn);
-			g_assert_cmpstr(actual->username, ==,
-						expected->username);
-			g_assert_cmpstr(actual->password, ==,
-						expected->password);
+			g_assert(!g_strcmp0(actual->apn, expected->apn));
+			g_assert(!g_strcmp0(actual->username,
+						expected->username));
+			g_assert(!g_strcmp0(actual->password,
+						expected->password));
 			g_assert(actual->auth_method == expected->auth_method);
-			g_assert_cmpstr(actual->message_proxy, ==,
-						expected->message_proxy);
-			g_assert_cmpstr(actual->message_center, ==,
-						expected->message_center);
+			g_assert(!g_strcmp0(actual->message_proxy,
+						expected->message_proxy));
+			g_assert(!g_strcmp0(actual->message_center,
+						expected->message_center));
 		}
 	} else {
 		g_assert(!__ofono_gprs_provision_get_settings(test->mcc,
@@ -212,14 +212,6 @@ static char telia_fi_message_center [] = "http://mms/";
 	.apn = "mms", \
 	.auth_method = OFONO_GPRS_AUTH_METHOD_NONE

-/* Default IMS settings */
-#define DEFAULT_IMS_SETTINGS \
-	.type = OFONO_GPRS_CONTEXT_TYPE_IMS, \
-	.proto = OFONO_GPRS_PROTO_IPV4V6, \
-	.name = "IMS", \
-	.apn = "ims", \
-	.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
-
 static const struct ofono_gprs_provision_data telia_fi_internet_mms_p[] = {
 	{
 		.type = OFONO_GPRS_CONTEXT_TYPE_INTERNET,
@@ -239,8 +231,7 @@ static const struct ofono_gprs_provision_data telia_fi_internet_mms_p[] = {
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE,
 		.message_proxy = telia_fi_message_proxy,
 		.message_center = telia_fi_message_center
-	},
-	{ DEFAULT_IMS_SETTINGS }
+	}
 };

 static const struct ofono_gprs_provision_data telia_fi_internet_mms[] = {
@@ -260,8 +251,7 @@ static const struct ofono_gprs_provision_data telia_fi_internet_mms[] = {
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE,
 		.message_proxy = telia_fi_message_proxy,
 		.message_center = telia_fi_message_center
-	},
-	{ DEFAULT_IMS_SETTINGS }
+	}
 };

 static const struct ofono_gprs_provision_data telia_fi_internet[] = {
@@ -273,8 +263,7 @@ static const struct ofono_gprs_provision_data telia_fi_internet[] = {
 		.apn = telia_fi_apn_internet,
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
 	},
-	{ DEFAULT_MMS_SETTINGS },
-	{ DEFAULT_IMS_SETTINGS }
+	{ DEFAULT_MMS_SETTINGS }
 };

 static const struct ofono_gprs_provision_data telia_fi_mms[] = {
@@ -288,14 +277,12 @@ static const struct ofono_gprs_provision_data telia_fi_mms[] = {
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE,
 		.message_proxy = telia_fi_message_proxy,
 		.message_center = telia_fi_message_center
-	},
-	{ DEFAULT_IMS_SETTINGS }
+	}
 };

 static const struct ofono_gprs_provision_data default_settings[] = {
 	{ DEFAILT_INTERNET_SETTINGS },
-	{ DEFAULT_MMS_SETTINGS },
-	{ DEFAULT_IMS_SETTINGS }
+	{ DEFAULT_MMS_SETTINGS }
 };

 static const struct ofono_gprs_provision_data no_auth_settings[] = {
@@ -313,8 +300,7 @@ static const struct ofono_gprs_provision_data no_auth_settings[] = {
 		.name = "MMS",
 		.apn = "mms",
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
-	},
-	{ DEFAULT_IMS_SETTINGS }
+	}
 };

 static const struct ofono_gprs_provision_data auth_settings[] = {
@@ -332,8 +318,7 @@ static const struct ofono_gprs_provision_data auth_settings[] = {
 		.apn = "mms",
 		.password = "password",
 		.auth_method = OFONO_GPRS_AUTH_METHOD_ANY
-	},
-	{ DEFAULT_IMS_SETTINGS }
+	}
 };

 static const struct ofono_gprs_provision_data settings_ip[] = {
@@ -344,8 +329,7 @@ static const struct ofono_gprs_provision_data settings_ip[] = {
 		.apn = "internet",
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
 	},
-	{ DEFAULT_MMS_SETTINGS },
-	{ DEFAULT_IMS_SETTINGS }
+	{ DEFAULT_MMS_SETTINGS }
 };

 static const struct ofono_gprs_provision_data settings_ipv6[] = {
@@ -361,8 +345,7 @@ static const struct ofono_gprs_provision_data settings_ipv6[] = {
 		.name = "MMS",
 		.apn = "mms",
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
-	},
-	{ DEFAULT_IMS_SETTINGS }
+	}
 };

 static const struct ofono_gprs_provision_data settings_ipv4v6[] = {
@@ -373,40 +356,7 @@ static const struct ofono_gprs_provision_data settings_ipv4v6[] = {
 		.name = "MMS",
 		.apn = "mms",
 		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
-	},
-	{ DEFAULT_IMS_SETTINGS }
-};
-
-static char beeline_provider_name [] = "Beeline";
-static const struct ofono_gprs_provision_data beeline_ims[] = {
-	{
-		.type = OFONO_GPRS_CONTEXT_TYPE_INTERNET,
-		.proto = OFONO_GPRS_PROTO_IPV4V6,
-		.provider_name = beeline_provider_name,
-		.name = "Beeline Internet",
-		.apn = "internet.beeline.ru",
-                .username = "beeline",
-                .password = "beeline",
-		.auth_method = OFONO_GPRS_AUTH_METHOD_ANY
-	}, {
-		.type = OFONO_GPRS_CONTEXT_TYPE_MMS,
-		.proto = OFONO_GPRS_PROTO_IP,
-		.provider_name = beeline_provider_name,
-		.name = "Beeline MMS",
-		.apn = "mms.beeline.ru",
-                .username = "beeline",
-                .password = "beeline",
-		.auth_method = OFONO_GPRS_AUTH_METHOD_PAP,
-		.message_proxy = "192.168.94.23:8080",
-		.message_center = "http://mms/"
-	}, {
-		.type = OFONO_GPRS_CONTEXT_TYPE_IMS,
-		.proto = OFONO_GPRS_PROTO_IPV4V6,
-		.provider_name = beeline_provider_name,
-		.name = "Beeline IMS",
-		.apn = "ims.beeline.ru",
-		.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
-        }
+	}
 };

 static char test_provider_name[] = "Test provider";
@@ -432,8 +382,7 @@ static const struct ofono_gprs_provision_data test_username_password[] = {
 		.auth_method = OFONO_GPRS_AUTH_METHOD_CHAP,
 		.message_proxy = test_message_proxy,
 		.message_center = test_message_center
-	},
-	{ DEFAULT_IMS_SETTINGS }
+	}
 };

 static const char telia_fi_internet_xml[] =
@@ -857,42 +806,6 @@ static const struct provision_test_case test_cases[] = {
 		.mnc = "91",
 		.settings = telia_fi_mms,
 		.count = G_N_ELEMENTS(telia_fi_mms)
-	},{
-		.name = TEST_SUITE "ims",
-		.xml =
-"<serviceproviders format=\"2.0\">\n\
-<country code=\"ru\">\n\
-  <provider>\n\
-    <name>Beeline</name>\n\
-    <gsm>\n\
-      <network-id mcc=\"250\" mnc=\"99\"/>\n\
-      <apn value=\"internet.beeline.ru\">\n\
-        <usage type=\"internet\"/>\n\
-        <name>Beeline Internet</name>\n\
-        <username>beeline</username>\n\
-        <password>beeline</password>\n\
-      </apn>\n\
-      <apn value=\"mms.beeline.ru\">\n\
-        <usage type=\"mms\"/>\n\
-        <name>Beeline MMS</name>\n\
-        <authentication method=\"pap\"/>\n\
-        <username>beeline</username>\n\
-        <password>beeline</password>\n\
-        <mmsc>http://mms/</mmsc>\n\
-        <mmsproxy>192.168.94.23:8080</mmsproxy>\n\
-      </apn>\n\
-      <apn value=\"ims.beeline.ru\">\n\
-        <usage type=\"ims\"/>\n\
-        <name>Beeline IMS</name>\n\
-      </apn>\n\
-    </gsm>\n\
-  </provider>\n\
-</country>\n\
-</serviceproviders>\n",
-		.mcc = "250",
-		.mnc = "99",
-		.settings = beeline_ims,
-		.count = G_N_ELEMENTS(beeline_ims)
 	},{
 		.name = TEST_SUITE "not_found_mcc",
 		.xml = telia_fi_internet_xml,
@@ -1384,11 +1297,3 @@ int main(int argc, char **argv)
 	}
 	return g_test_run();
 }
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/unit/test-ril_config.c
+++ b/ofono/unit/test-ril_config.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2018-2020 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2018-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -377,39 +377,6 @@ static void test_get_enum(void)
 	test_get_value(conf, test_get_enum_cb);
 }

-/* ==== get_mask ==== */
-
-static void test_get_mask_cb(GKeyFile *k)
-{
-	int v = 0;
-
-	g_assert(!ril_config_get_mask(k, "g1", "k", NULL, "x",1, "y",2, NULL));
-	g_assert(!ril_config_get_mask(k, "g1", "k", &v, "x",1, "y",2, NULL));
-	g_assert_cmpint(v, ==, 0);
-
-	g_assert(ril_config_get_mask(k, "g", "k", NULL, "x",1, "y",2, NULL));
-	g_assert(ril_config_get_mask(k, "g", "k", &v, "x",1, "y",2, NULL));
-	g_assert_cmpint(v, ==, 1);
-
-	g_assert(ril_config_get_mask(k, "g", "k1", NULL, "x",1, "y",2, NULL));
-	g_assert(ril_config_get_mask(k, "g", "k1", &v, "x",1, "y",2, NULL));
-	g_assert_cmpint(v, ==, 3);
-
-	g_assert(!ril_config_get_mask(k, "g", "k2", NULL, "x",1, "y",2, NULL));
-	g_assert(!ril_config_get_mask(k, "g", "k2", &v, "x",1, "y",2, NULL));
-	g_assert_cmpint(v, ==, 0);
-}
-
-static void test_get_mask(void)
-{
-	static const char conf [] = "[g]\n"
-		"k = x# comment\n"
-		"k1 = x+y\n"
-		"k2 = x+z+y\n";
-
-	test_get_value(conf, test_get_mask_cb);
-}
-
 /* ==== get_ints ==== */

 static void test_get_ints_cb(GKeyFile *k)
@@ -484,7 +451,6 @@ int main(int argc, char *argv[])
 	g_test_add_func(TEST_("get_boolean3"), test_get_boolean3);
 	g_test_add_func(TEST_("get_flag"), test_get_flag);
 	g_test_add_func(TEST_("get_enum"), test_get_enum);
-	g_test_add_func(TEST_("get_mask"), test_get_mask);
 	g_test_add_func(TEST_("get_ints"), test_get_ints);
 	g_test_add_func(TEST_("ints_to_string"), test_ints_to_string);

--- a/ofono/unit/test-sailfish_cell_info_dbus.c
+++ b/ofono/unit/test-sailfish_cell_info_dbus.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2018-2021 Jolla Ltd.
+ *  Copyright (C) 2018 Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -31,7 +31,6 @@
 #define CELL_INFO_DBUS_INTERFACE            "org.nemomobile.ofono.CellInfo"
 #define CELL_INFO_DBUS_CELLS_ADDED_SIGNAL   "CellsAdded"
 #define CELL_INFO_DBUS_CELLS_REMOVED_SIGNAL "CellsRemoved"
-#define CELL_INFO_DBUS_UNSUBSCRIBED_SIGNAL  "Unsubscribed"

 #define CELL_DBUS_INTERFACE_VERSION         (1)
 #define CELL_DBUS_INTERFACE                 "org.nemomobile.ofono.Cell"
@@ -67,7 +66,7 @@ static gboolean test_timeout(gpointer param)

 static guint test_setup_timeout(void)
 {
-	if (test_debug) {
+	if (!test_debug) {
 		return 0;
 	} else {
 		return g_timeout_add_seconds(TEST_TIMEOUT, test_timeout, NULL);
@@ -103,19 +102,6 @@ static DBusMessage *test_new_cell_call(const char *path, const char *method)
 	return msg;
 }

-static void test_submit_cell_info_call(DBusConnection* connection,
-		const char *method, DBusPendingCallNotifyFunction notify,
-		void *data)
-{
-	DBusMessage *msg = test_new_cell_info_call(method);
-	DBusPendingCall* call;
-
-	g_assert(dbus_connection_send_with_reply(connection, msg, &call,
-						DBUS_TIMEOUT_INFINITE));
-	dbus_pending_call_set_notify(call, notify, data, NULL);
-	dbus_message_unref(msg);
-}
-
 static void test_submit_get_all_call(DBusConnection* connection,
 		const char *cell_path, DBusPendingCallNotifyFunction notify,
 		void *data)
@@ -200,26 +186,6 @@ static void test_check_get_all_reply(DBusPendingCall *call,
 	dbus_message_unref(reply);
 }

-static void test_check_empty_reply(DBusPendingCall *call)
-{
-	DBusMessage *reply = dbus_pending_call_steal_reply(call);
-	DBusMessageIter it;
-
-	g_assert(dbus_message_get_type(reply) ==
-					DBUS_MESSAGE_TYPE_METHOD_RETURN);
-	dbus_message_iter_init(reply, &it);
-	g_assert(dbus_message_iter_get_arg_type(&it) == DBUS_TYPE_INVALID);
-	dbus_message_unref(reply);
-}
-
-static void test_check_error(DBusPendingCall *call, const char* name)
-{
-	DBusMessage *reply = dbus_pending_call_steal_reply(call);
-
-	g_assert(dbus_message_is_error(reply, name));
-	dbus_message_unref(reply);
-}
-
 static struct sailfish_cell *test_cell_init_gsm1(struct sailfish_cell *cell)
 {
 	struct sailfish_cell_info_gsm *gsm = &cell->info.gsm;
@@ -345,13 +311,19 @@ struct test_get_cells_data {
 static void test_get_cells_call(struct test_get_cells_data *test,
 				DBusPendingCallNotifyFunction notify)
 {
-	test_submit_cell_info_call(test->context.client_connection, "GetCells",
-								notify, test);
+	DBusPendingCall *call;
+	DBusConnection *connection = test->context.client_connection;
+	DBusMessage *msg = test_new_cell_info_call("GetCells");
+
+	g_assert(dbus_connection_send_with_reply(connection, msg, &call,
+						DBUS_TIMEOUT_INFINITE));
+	dbus_pending_call_set_notify(call, notify, test, NULL);
+	dbus_message_unref(msg);
 }

 static void test_get_cells_start_reply3(DBusPendingCall *call, void *data)
 {
-	struct test_get_cells_data *test = data;
+ 	struct test_get_cells_data *test = data;
 	DBusMessageIter it;
 	DBusMessage *signal = test_dbus_take_signal(&test->context,
 				test->modem.path, CELL_INFO_DBUS_INTERFACE,
@@ -372,7 +344,7 @@ static void test_get_cells_start_reply3(DBusPendingCall *call, void *data)

 static void test_get_cells_start_reply2(DBusPendingCall *call, void *data)
 {
-	struct test_get_cells_data *test = data;
+ 	struct test_get_cells_data *test = data;
 	const char *cell_added = "/test/cell_1";
 	struct sailfish_cell cell;
 	DBusMessageIter it;
@@ -399,7 +371,7 @@ static void test_get_cells_start_reply2(DBusPendingCall *call, void *data)

 static void test_get_cells_start_reply1(DBusPendingCall *call, void *data)
 {
-	struct test_get_cells_data *test = data;
+ 	struct test_get_cells_data *test = data;
 	struct sailfish_cell cell;

 	DBG("");
@@ -460,7 +432,7 @@ struct test_get_all_data {

 static void test_get_all_reply(DBusPendingCall *call, void *data)
 {
-	struct test_get_all_data *test = data;
+ 	struct test_get_all_data *test = data;

 	DBG("");
 	test_check_get_all_reply(call, &test->cell, test->type);
@@ -547,7 +519,7 @@ struct test_get_version_data {

 static void test_get_version_reply(DBusPendingCall *call, void *data)
 {
-	struct test_get_version_data *test = data;
+ 	struct test_get_version_data *test = data;
 	DBusMessage *reply = dbus_pending_call_steal_reply(call);
 	dbus_int32_t version;

@@ -616,7 +588,7 @@ struct test_get_type_data {

 static void test_get_type_reply(DBusPendingCall *call, void *data)
 {
-	struct test_get_type_data *test = data;
+ 	struct test_get_type_data *test = data;
 	DBusMessage *reply = dbus_pending_call_steal_reply(call);
 	DBusMessageIter it;

@@ -684,7 +656,7 @@ struct test_get_registered_data {

 static void test_get_registered_reply(DBusPendingCall *call, void *data)
 {
-	struct test_get_registered_data *test = data;
+ 	struct test_get_registered_data *test = data;
 	DBusMessage *reply = dbus_pending_call_steal_reply(call);
 	DBusMessageIter it;

@@ -753,7 +725,7 @@ struct test_get_properties_data {

 static void test_get_properties_reply(DBusPendingCall *call, void *data)
 {
-	struct test_get_properties_data *test = data;
+ 	struct test_get_properties_data *test = data;
 	DBusMessage *reply = dbus_pending_call_steal_reply(call);
 	DBusMessageIter it, array;

@@ -827,9 +799,9 @@ struct test_registered_changed_data {
 	const char *cell_path;
 };

-static void test_registered_changed_reply2(DBusPendingCall *call, void *data)
+static void test_registered_changed_reply(DBusPendingCall *call, void *data)
 {
-	struct test_registered_changed_data *test = data;
+ 	struct test_registered_changed_data *test = data;

 	DBG("");
 	test_check_get_all_reply(call, &test->cell, test->type);
@@ -838,29 +810,11 @@ static void test_registered_changed_reply2(DBusPendingCall *call, void *data)
 	test_loop_quit_later(test->context.loop);
 }

-static void test_registered_changed_reply1(DBusPendingCall *call, void *data)
-{
-	struct test_registered_changed_data *test = data;
-	struct sailfish_cell *first_cell;
-
-	DBG("");
-	test_check_get_cells_reply(call, test->cell_path, NULL);
-	dbus_pending_call_unref(call);
-
-	/* Trigger "RegisteredChanged" signal */
-	first_cell = test->info->cells->data;
-	test->cell.registered =
-	first_cell->registered = !first_cell->registered;
-	fake_cell_info_cells_changed(test->info);
-
-	test_submit_get_all_call(test->context.client_connection,
-		test->cell_path, test_registered_changed_reply2, test);
-}
-
 static void test_registered_changed_start(struct test_dbus_context *context)
 {
 	struct test_registered_changed_data *test =
 		G_CAST(context, struct test_registered_changed_data, context);
+	struct sailfish_cell *first_cell;

 	DBG("");
 	test->info = fake_cell_info_new();
@@ -868,9 +822,14 @@ static void test_registered_changed_start(struct test_dbus_context *context)
 	test->dbus = sailfish_cell_info_dbus_new(&test->modem, test->info);
 	g_assert(test->dbus);

-	/* Submit GetCells to enable "RegisteredChanged" signals */
-	test_submit_cell_info_call(test->context.client_connection, "GetCells",
-					test_registered_changed_reply1, test);
+	/* Trigger "RegisteredChanged" signal */
+	first_cell = test->info->cells->data;
+	test->cell.registered =
+	first_cell->registered = !first_cell->registered;
+	fake_cell_info_cells_changed(test->info);
+
+	test_submit_get_all_call(context->client_connection, test->cell_path,
+				test_registered_changed_reply, test);
 }

 static void test_registered_changed(void)
@@ -912,41 +871,22 @@ struct test_property_changed_data {
 	const char *cell_path;
 };

-static void test_property_changed_reply2(DBusPendingCall *call, void *data)
+static void test_property_changed_reply1(DBusPendingCall *call, void *data)
 {
-	struct test_property_changed_data *test = data;
+ 	struct test_property_changed_data *test = data;

 	DBG("");
 	test_check_get_all_reply(call, &test->cell, test->type);
 	dbus_pending_call_unref(call);

 	test_loop_quit_later(test->context.loop);
-	test_dbus_watch_disconnect_all();
-}
-
-static void test_property_changed_reply1(DBusPendingCall *call, void *data)
-{
-	struct test_property_changed_data *test = data;
-	struct sailfish_cell *first_cell;
-
-	DBG("");
-	test_check_get_cells_reply(call, test->cell_path, NULL);
-	dbus_pending_call_unref(call);
-
-	/* Trigger "PropertyChanged" signal */
-	first_cell = test->info->cells->data;
-	test->cell.info.gsm.signalStrength =
-		(++(first_cell->info.gsm.signalStrength));
-	fake_cell_info_cells_changed(test->info);
-
-	test_submit_get_all_call(test->context.client_connection,
-			test->cell_path, test_property_changed_reply2, test);
 }

 static void test_property_changed_start(struct test_dbus_context *context)
 {
 	struct test_property_changed_data *test =
 		G_CAST(context, struct test_property_changed_data, context);
+	struct sailfish_cell *first_cell;

 	DBG("");
 	test->info = fake_cell_info_new();
@@ -954,9 +894,14 @@ static void test_property_changed_start(struct test_dbus_context *context)
 	test->dbus = sailfish_cell_info_dbus_new(&test->modem, test->info);
 	g_assert(test->dbus);

-	/* Submit GetCells to enable "PropertyChanged" signals */
-	test_submit_cell_info_call(test->context.client_connection, "GetCells",
-					test_property_changed_reply1, test);
+	/* Trigger "PropertyChanged" signal */
+	first_cell = test->info->cells->data;
+	test->cell.info.gsm.signalStrength =
+		(++(first_cell->info.gsm.signalStrength));
+	fake_cell_info_cells_changed(test->info);
+
+	test_submit_get_all_call(context->client_connection, test->cell_path,
+				test_property_changed_reply1, test);
 }

 static void test_property_changed(void)
@@ -986,106 +931,6 @@ static void test_property_changed(void)
 	}
 }

-/* ==== Unsubscribe ==== */
-
-struct test_unsubscribe_data {
-	struct ofono_modem modem;
-	struct test_dbus_context context;
-	struct sailfish_cell_info *info;
-	struct sailfish_cell_info_dbus *dbus;
-	struct sailfish_cell cell;
-	const char *type;
-	const char *cell_path;
-};
-
-static void test_unsubscribe_reply3(DBusPendingCall *call, void *data)
-{
-	struct test_unsubscribe_data *test = data;
-
-	DBG("");
-	test_check_error(call, OFONO_ERROR_INTERFACE ".Failed");
-	dbus_pending_call_unref(call);
-
-	test_loop_quit_later(test->context.loop);
-	test_dbus_watch_disconnect_all();
-}
-
-static void test_unsubscribe_reply2(DBusPendingCall *call, void *data)
-{
-	struct test_unsubscribe_data *test = data;
-	struct sailfish_cell *first_cell;
-
-	DBG("");
-	test_check_empty_reply(call);
-	dbus_pending_call_unref(call);
-
-	/* No "PropertyChanged" signal is expected because it's disabled */
-	first_cell = test->info->cells->data;
-	test->cell.info.gsm.signalStrength =
-		(++(first_cell->info.gsm.signalStrength));
-	fake_cell_info_cells_changed(test->info);
-
-	/* Submit Unsubscribe and expect and error */
-	test_submit_cell_info_call(test->context.client_connection,
-			"Unsubscribe", test_unsubscribe_reply3, test);
-}
-
-static void test_unsubscribe_reply1(DBusPendingCall *call, void *data)
-{
-	struct test_unsubscribe_data *test = data;
-
-	DBG("");
-	test_check_get_cells_reply(call, test->cell_path, NULL);
-	dbus_pending_call_unref(call);
-
-	/* Submit Unsubscribe to disable "PropertyChanged" signals */
-	test_submit_cell_info_call(test->context.client_connection,
-			"Unsubscribe", test_unsubscribe_reply2, test);
-}
-
-static void test_unsubscribe_start(struct test_dbus_context *context)
-{
-	struct test_unsubscribe_data *test =
-		G_CAST(context, struct test_unsubscribe_data, context);
-
-	DBG("");
-	test->info = fake_cell_info_new();
-	fake_cell_info_add_cell(test->info, &test->cell);
-	test->dbus = sailfish_cell_info_dbus_new(&test->modem, test->info);
-	g_assert(test->dbus);
-
-	/* Submit GetCells to enable "PropertyChanged" signals */
-	test_submit_cell_info_call(test->context.client_connection, "GetCells",
-					test_unsubscribe_reply1, test);
-}
-
-static void test_unsubscribe(void)
-{
-	struct test_unsubscribe_data test;
-	guint timeout = test_setup_timeout();
-
-	memset(&test, 0, sizeof(test));
-	test.modem.path = TEST_MODEM_PATH;
-	test.context.start = test_unsubscribe_start;
-	test_cell_init_gsm1(&test.cell);
-	test.type = "gsm";
-	test.cell_path = "/test/cell_0";
-	test_dbus_setup(&test.context);
-
-	g_main_loop_run(test.context.loop);
-
-	/* We must have received "Unsubscribed" signal */
-	g_assert(test_dbus_find_signal(&test.context, test.modem.path,
-		CELL_INFO_DBUS_INTERFACE, CELL_INFO_DBUS_UNSUBSCRIBED_SIGNAL));
-
-	sailfish_cell_info_unref(test.info);
-	sailfish_cell_info_dbus_free(test.dbus);
-	test_dbus_shutdown(&test.context);
-	if (timeout) {
-		g_source_remove(timeout);
-	}
-}
-
 #define TEST_(name) "/sailfish_cell_info_dbus/" name

 int main(int argc, char *argv[])
@@ -1121,7 +966,6 @@ int main(int argc, char *argv[])
 	g_test_add_func(TEST_("GetProperties"), test_get_properties);
 	g_test_add_func(TEST_("RegisteredChanged"), test_registered_changed);
 	g_test_add_func(TEST_("PropertyChanged"), test_property_changed);
-	g_test_add_func(TEST_("Unsubscribe"), test_unsubscribe);

 	return g_test_run();
 }
--- a/ofono/unit/test-simutil.c
+++ b/ofono/unit/test-simutil.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -492,12 +491,12 @@ static void test_application_entry_decode(void)
 	app[0] = entries->next->data;
 	app[1] = entries->data;

-	g_assert(app[0]->aid.len == 0x10);
-	g_assert(!memcmp(app[0]->aid.aid, &ef_dir[4], 0x10));
+	g_assert(app[0]->aid_len == 0x10);
+	g_assert(!memcmp(app[0]->aid, &ef_dir[4], 0x10));
 	g_assert(app[0]->label == NULL);

-	g_assert(app[1]->aid.len == 0x0c);
-	g_assert(!memcmp(app[1]->aid.aid, &ef_dir[37], 0x0c));
+	g_assert(app[1]->aid_len == 0x0c);
+	g_assert(!memcmp(app[1]->aid, &ef_dir[37], 0x0c));
 	g_assert(app[1]->label != NULL);
 	g_assert(!strcmp(app[1]->label, "MIDPfiles"));

@@ -530,34 +529,32 @@ static void test_get_2g_path(void)
 static void test_auth_build_parse(void)
 {
 	unsigned char auth_cmd[40];
-	const unsigned char rand[] = { 0x00, 0x01, 0x02, 0x03, 0x04,0x05,
+	const unsigned char rand[16] = { 0x00, 0x01, 0x02, 0x03, 0x04,0x05,
 			0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,
 			0x0e, 0x0f };
-	const unsigned char sres[] = { 0x00, 0x11, 0x22, 0x33 };
+	const unsigned char sres[4] = { 0x00, 0x11, 0x22, 0x33 };
 	const unsigned char *sres_p;
-	struct data_block sres_b;
 	const unsigned char kc[8] = { 0xab, 0xcd, 0xef, 0x12, 0x34, 0x56,
 			0x78, 0x9a };
 	const unsigned char *kc_p;
-	struct data_block kc_b;
 	const unsigned char gsm_success[] = { 0x04, 0x00, 0x11, 0x22, 0x33,
 			0x08,0xab, 0xcd, 0xef, 0x12, 0x34, 0x56, 0x78, 0x9a };
-	const unsigned char autn[] = { 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a,
+	const unsigned char autn[16] = { 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a,
 			0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02,
 			0x01, 0x00 };
-	const unsigned char res[] = { 0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa,
+	const unsigned char res[8] = { 0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa,
 			0x11, 0x22 };
-	struct data_block res_b;
-	const unsigned char ck[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
+	const unsigned char *res_p;
+	const unsigned char ck[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
 			0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
-	struct data_block ck_b;
-	const unsigned char ik[] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd,
+	const unsigned char *ck_p;
+	const unsigned char ik[16] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd,
 			0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 };
-	struct data_block ik_b;
-	const unsigned char auts[] = { 0xde, 0xea,
-			0xbe, 0xef, 0xde, 0xea, 0xbe, 0xef, 0xde, 0xea, 0xbe,
-			0xef, 0xde, 0xea };
-	struct data_block auts_b;
+	const unsigned char *ik_p;
+	const unsigned char auts[16] = { 0xde, 0xea, 0xbe, 0xef, 0xde, 0xea,
+			0xbe, 0xef, 0xde, 0xea, 0xbe, 0xef, 0xde, 0xea,
+			0xbe, 0xef };
+	const unsigned char *auts_p;

 	const unsigned char umts_success[] = { 0xdb, 0x08, 0xff, 0xee, 0xdd,
 			0xcc, 0xbb, 0xaa, 0x11, 0x22, 0x10, 0x00, 0x11, 0x22,
@@ -575,8 +572,6 @@ static void test_auth_build_parse(void)
 	const unsigned char umts_sync_failure[] = { 0xdc, 0x0e, 0xde, 0xea,
 			0xbe, 0xef, 0xde, 0xea, 0xbe, 0xef, 0xde, 0xea, 0xbe,
 			0xef, 0xde, 0xea };
-	const unsigned char case3[] = { 0x04, 0x01, 0x02, 0x03, 0x04,
-			0x08, 0xab, 0xcd, 0xef, 0x12, 0x34, 0x56, 0x78, 0x9a };
 	int len = 0;

 	/* test GSM auth command */
@@ -611,96 +606,31 @@ static void test_auth_build_parse(void)
 	g_assert(!memcmp(sres_p, sres, 4));
 	g_assert(!memcmp(kc_p, kc, 8));

-	/* test truncated messages */
-	g_assert(!sim_parse_umts_authenticate(umts_success, 1,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(umts_success, 2,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(umts_success, 10,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(umts_success, 11,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(umts_success, 27,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(umts_success, 28,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(umts_sync_failure, 2,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(case3, 2,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(case3, 5,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(case3, 6,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-
-	/* the extra byte won't actually be accessed */
-	g_assert(!sim_parse_umts_authenticate(umts_success,
-			sizeof(umts_success) + 1,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(umts_sync_failure,
-			sizeof(umts_sync_failure) + 1,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert(!sim_parse_umts_authenticate(case3, sizeof(case3) + 1,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-
-	/* unrecognized data */
-	g_assert(!sim_parse_umts_authenticate(case3 + 1, sizeof(case3) - 1,
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-
 	/* test UMTS success parse, no kc */
 	g_assert(sim_parse_umts_authenticate(umts_success, sizeof(umts_success),
-			&res_b, &ck_b, &ik_b, &auts_b, &sres_b, &kc_b));
-	g_assert_cmpuint(res_b.len, == , sizeof(res));
-	g_assert(!memcmp(res_b.data, res, sizeof(res)));
-	g_assert_cmpuint(ck_b.len, == , sizeof(ck));
-	g_assert(!memcmp(ck_b.data, ck, sizeof(ck)));
-	g_assert_cmpuint(ik_b.len, == , sizeof(ik));
-	g_assert(!memcmp(ik_b.data, ik, sizeof(ik)));
-	g_assert(!sres_b.len && !sres_b.data);
-	g_assert(!auts_b.len && !auts_b.data);
-	g_assert(!kc_b.len && !kc_b.data);
+			&res_p, &ck_p, &ik_p, &auts_p, &kc_p));
+	g_assert(!memcmp(res_p, res, 8));
+	g_assert(!memcmp(ck_p, ck, 16));
+	g_assert(!memcmp(ik_p, ik, 16));
+	g_assert(!auts_p && !kc_p);

 	/* test UMTS sync failure */
 	g_assert(sim_parse_umts_authenticate(umts_sync_failure,
 						sizeof(umts_sync_failure),
-						&res_b, &ck_b, &ik_b, &auts_b,
-						&sres_b, &kc_b));
-	g_assert_cmpuint(auts_b.len, == , sizeof(auts));
-	g_assert(!memcmp(auts_b.data, auts, sizeof(auts)));
-	g_assert(!res_b.len && !res_b.data);
-	g_assert(!ck_b.len && !ck_b.data);
-	g_assert(!ik_b.len && !ik_b.data);
-	g_assert(!sres_b.len && !sres_b.data);
-	g_assert(!kc_b.len && !kc_b.data);
+						&res_p, &ck_p, &ik_p, &auts_p,
+						&kc_p));
+	g_assert(!memcmp(auts_p, auts, 14));

 	/* test UMTS success parse, with kc */
 	g_assert(sim_parse_umts_authenticate(umts_success_kc,
 						sizeof(umts_success_kc),
-						&res_b, &ck_b, &ik_b, &auts_b,
-						&sres_b, &kc_b));
-	g_assert_cmpuint(res_b.len, == , sizeof(res));
-	g_assert(!memcmp(res_b.data, res, sizeof(res)));
-	g_assert_cmpuint(ck_b.len, == , sizeof(ck));
-	g_assert(!memcmp(ck_b.data, ck, sizeof(ck)));
-	g_assert_cmpuint(ik_b.len, == , sizeof(ik));
-	g_assert(!memcmp(ik_b.data, ik, sizeof(ik)));
-	g_assert_cmpuint(kc_b.len, == , sizeof(kc));
-	g_assert(!memcmp(kc_b.data, kc, sizeof(kc)));
-	g_assert(!sres_b.len && !sres_b.data);
-	g_assert(!auts_b.len && !auts_b.data);
-
-	/* test case3 */
-	g_assert(sim_parse_umts_authenticate(case3, sizeof(case3),
-						&res_b, &ck_b, &ik_b, &auts_b,
-						&sres_b, &kc_b));
-	g_assert(!res_b.len && !res_b.data);
-	g_assert(!ck_b.len && !ck_b.data);
-	g_assert(!ik_b.len && !ik_b.data);
-	g_assert(!auts_b.len && !auts_b.data);
-	g_assert_cmpuint(sres_b.len, == , 4);
-	g_assert(!memcmp(sres_b.data, case3 + 1, sres_b.len));
-	g_assert_cmpuint(kc_b.len, == , sizeof(kc));
-	g_assert(!memcmp(kc_b.data, kc, sizeof(kc)));
+						&res_p, &ck_p, &ik_p, &auts_p,
+						&kc_p));
+	g_assert(!memcmp(res_p, res, 8));
+	g_assert(!memcmp(ck_p, ck, 16));
+	g_assert(!memcmp(ik_p, ik, 16));
+	g_assert(!memcmp(kc_p, kc, 8));
+	g_assert(!auts_p);
 }

 int main(int argc, char **argv)
--- a/rpm/ofono.spec
+++ b/rpm/ofono.spec
@@ -2,11 +2,12 @@ Name:       ofono
 Summary:    Open Source Telephony
 Version:    1.23
 Release:    1
+Group:      Communications/Connectivity Adaptation
 License:    GPLv2
 URL:        https://git.sailfishos.org/mer-core/ofono
 Source:     %{name}-%{version}.tar.bz2

-%define libgrilio_version 1.0.38
+%define libgrilio_version 1.0.35
 %define libglibutil_version 1.0.30
 %define libmce_version 1.0.6

@@ -37,13 +38,13 @@ BuildRequires:  pkgconfig(mobile-broadband-provider-info)
 BuildRequires:  libtool
 BuildRequires:  automake
 BuildRequires:  autoconf
-BuildRequires:  systemd

 %description
 Telephony stack

 %package devel
 Summary:    Headers for oFono
+Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}

 %description devel
@@ -51,6 +52,7 @@ Development headers and libraries for oFono

 %package tests
 Summary:    Test Scripts for oFono
+Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   dbus-python3
 Requires:   python3-gobject
@@ -62,6 +64,7 @@ Scripts for testing oFono and its functionality

 %package configs-mer
 Summary:    Package to provide default configs for ofono
+Group:      Development/Tools
 Provides:   ofono-configs

 %description configs-mer
@@ -69,6 +72,7 @@ This package provides default configs for ofono

 %package doc
 Summary:   Documentation for %{name}
+Group:     Documentation
 Requires:  %{name} = %{version}-%{release}

 %description doc
@@ -94,9 +98,9 @@ autoreconf --force --install
    --disable-add-remove-context \
    --disable-isimodem \
    --disable-qmimodem \
-    --with-systemdunitdir=%{_unitdir}
+    --with-systemdunitdir="/%{_lib}/systemd/system"

-%make_build
+make %{_smp_mflags}

 %check
 # run unit tests
@@ -107,9 +111,9 @@ rm -rf %{buildroot}
 %make_install

 mkdir -p %{buildroot}/%{_sysconfdir}/ofono/push_forwarder.d
-mkdir -p %{buildroot}%{_unitdir}/network.target.wants
+mkdir -p %{buildroot}/%{_lib}/systemd/system/network.target.wants
 mkdir -p %{buildroot}/var/lib/ofono
-ln -s ../ofono.service %{buildroot}%{_unitdir}/network.target.wants/ofono.service
+ln -s ../ofono.service %{buildroot}/%{_lib}/systemd/system/network.target.wants/ofono.service

 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
 install -m0644 -t %{buildroot}%{_docdir}/%{name}-%{version} \
@@ -135,8 +139,8 @@ systemctl daemon-reload ||:
 %license COPYING
 %config %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sbindir}/*
-%{_unitdir}/network.target.wants/ofono.service
-%{_unitdir}/ofono.service
+/%{_lib}/systemd/system/network.target.wants/ofono.service
+/%{_lib}/systemd/system/ofono.service
 %dir %{_sysconfdir}/ofono/
 %dir %{_sysconfdir}/ofono/push_forwarder.d
 # This file is part of phonesim and not needed with ofono.