[voicecall] Cancel pending DTMF tones before hanging up call.

2014-06-04 13:10:51 +03:00
191 changed files with 1578 additions and 6064 deletions
--- a/ofono/AUTHORS
+++ b/ofono/AUTHORS
@@ -92,10 +92,3 @@ Jesper Larsen <jesper.larsen@ixonos.com>
 Slava Monich <slava.monich@jolla.com>
 Andrew Earl <andrewx.earl@intel.com>
 Krzysztof Wilk <krzysztofx.wilk@intel.com>
-Tony Espy <espy@canonical.com>
-Martin Pitt <martin.pitt@ubuntu.com>
-Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com>
-Jussi Pakkanen <jussi.pakkanen@canonical.com>
-Sergio Checa Blanco <sergio.checa@bmw-carit.de>
-Philip Paeps <philip@paeps.cx>
-Kuba Pawlak <kubax.t.pawlak@intel.com>
--- a/ofono/ChangeLog
+++ b/ofono/ChangeLog
@@ -1,23 +1,3 @@
-ver 1.16:
-	Fix issue with PIN retry handling.
-	Fix issue with HFP and multiple calls.
-	Add support for Distracted Driving Reduction.
-	Add support for available technologies property.
-	Add support for Telit location reporting driver.
-	Add support for u-blox SARA-U270 modems.
-	Add support for Quectel UC15 modems.
-
-ver 1.15:
-	Fix issue with EF_PNN access affecting PLMN display.
-	Fix issue with SIM detection and Telit HE910 modems.
-	Fix issue with Mobile Provider Database provisioning.
-	Fix issue with bit-shifting and ID mapping allocations.
-	Fix issue with Handsfree and unsolicited notifications.
-	Fix issue with Handsfree and three way calling feature.
-	Add support for Handsfree subscriber number feature.
-	Add support for Handsfree multiple DTMF characters.
-	Add support for PAP authentication.
-
 ver 1.14:
 	Add support for Apple Siri specific Handsfree commands.
 	Add support for provisioning of MMSC and Message Proxy.
--- a/ofono/Makefile.am
+++ b/ofono/Makefile.am
@@ -21,9 +21,8 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/cdma-connman.h include/gnss.h \
 			include/private-network.h include/cdma-netreg.h \
 			include/cdma-provision.h include/handsfree.h \
-			include/handsfree-audio.h \
-			include/sim-mnclength.h include/oemraw.h \
-			include/siri.h
+			include/handsfree-audio.h include/sim-mnclength.h \
+			include/oemraw.h include/siri.h

 nodist_pkginclude_HEADERS = include/version.h

@@ -121,9 +120,6 @@ endif
 if RILMODEM
 builtin_sources += $(gril_sources)

-builtin_modules += rildev
-builtin_sources += plugins/rildev.c
-
 builtin_modules += ril
 builtin_sources += plugins/ril.c

@@ -313,12 +309,6 @@ builtin_sources += drivers/atmodem/atutil.h \
 			drivers/mbmmodem/stk.c \
 			drivers/mbmmodem/location-reporting.c

-builtin_modules += telitmodem
-builtin_sources += drivers/atmodem/atutil.h \
-			drivers/telitmodem/telitmodem.h \
-			drivers/telitmodem/telitmodem.c \
-			drivers/telitmodem/location-reporting.c
-
 builtin_modules += hsomodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/hsomodem/hsomodem.h \
@@ -468,20 +458,14 @@ builtin_sources += plugins/samsung.c

 builtin_modules += sim900
 builtin_sources += plugins/sim900.c
-
-builtin_modules += quectel
-builtin_sources += plugins/quectel.c
-
-builtin_modules += ublox
-builtin_sources += plugins/ublox.c
-
-builtin_modules += he910
-builtin_sources += plugins/he910.c
 endif

 builtin_modules += connman
 builtin_sources += plugins/connman.c

+builtin_modules += he910
+builtin_sources += plugins/he910.c
+
 if BLUETOOTH
 if BLUEZ4
 builtin_modules += bluez4
@@ -557,9 +541,6 @@ builtin_sources += examples/private-network.c

 builtin_modules += stktest
 builtin_sources += plugins/stktest.c
-
-builtin_modules += emulator_fuzz
-builtin_sources += plugins/emulator_fuzz.c
 endif

 builtin_modules += smart_messaging
@@ -605,8 +586,8 @@ src_ofonod_SOURCES = $(builtin_sources) src/ofono.ver \
 			src/cdma-sms.c src/private-network.c src/cdma-netreg.c \
 			src/cdma-provision.c src/handsfree.c \
 			src/handsfree-audio.c src/bluetooth.h \
-			src/sim-mnclength.c src/oemraw.c src/voicecallagent.c \
-			src/hfp.h src/siri.c
+			src/hfp.h src/sim-mnclength.c src/oemraw.c \
+			src/siri.c src/voicecallagent.c

 src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
@@ -649,10 +630,9 @@ doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 			doc/sim-api.txt doc/stk-api.txt \
 			doc/audio-settings-api.txt doc/text-telephony-api.txt \
 			doc/calypso-modem.txt doc/message-api.txt \
-			doc/location-reporting-api.txt \
-			doc/smshistory-api.txt doc/oemraw-api.txt \
-			doc/certification.txt doc/siri-api.txt \
-			doc/telit-modem.txt
+			doc/location-reporting-api.txt doc/smshistory-api.txt \
+			doc/oemraw-api.txt \
+			doc/certification.txt doc/siri-api.txt


 test_scripts = test/backtrace \
@@ -740,7 +720,6 @@ test_scripts = test/backtrace \
 		test/set-context-property \
 		test/test-gnss \
 		test/swap-calls \
-		test/transfer-call \
 		test/release-and-answer \
 		test/release-and-swap \
 		test/hold-and-answer \
@@ -749,8 +728,7 @@ test_scripts = test/backtrace \
 		test/display-icon \
 		test/set-msisdn \
 		test/test-voicecallagent \
-		test/get-network-time \
-		test/set-ddr
+		test/get-network-time

 if TEST
 testdir = $(pkglibdir)/test
--- a/ofono/acinclude.m4
+++ b/ofono/acinclude.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AC_PROG_CC_PIE], [

 AC_DEFUN([COMPILER_FLAGS], [
 	if (test "${CFLAGS}" = ""); then
-		CFLAGS="-Wall -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
+		CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2"
 	fi
 	if (test "$USE_MAINTAINER_MODE" = "yes"); then
 		CFLAGS="$CFLAGS -Werror -Wextra"
--- a/ofono/configure.ac
+++ b/ofono/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 1.16)
+AC_INIT(ofono, 1.14)

 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
--- a/ofono/doc/connman-api.txt
+++ b/ofono/doc/connman-api.txt
@@ -155,15 +155,6 @@ Methods		dict GetProperties()
 					 [service].Error.AttachInProgress
 					 [service].Error.NotImplemented

-Methods		void ProvisionContext()
-			Resets all properties back to default. Fails to make
-			any changes to the context if it is active or in the
-			process of being activated or deactivated.
-
-			Possible Errors: [service].Error.Failed
-					 [service].Error.InProgress
-					 [service].Error.NotAvailable
-
 Signals		PropertyChanged(string property, variant value)

 			This signal indicates a changed value of the given
@@ -189,10 +180,6 @@ Properties	boolean Active [readwrite]
 				"wap" - Used by WAP related services
 				"ims" - Used by IMS related services

-		string AuthenticationMethod [readwrite]
-			Holds the PPP authentication method to use.  Valid
-			values are "pap" and "chap".  Defaults to "chap".
-
 		string Username [readwrite]

 			Holds the username to be used for authentication
--- a/ofono/doc/handsfree-api.txt
+++ b/ofono/doc/handsfree-api.txt
@@ -19,8 +19,6 @@ Methods		dict GetProperties()

 			Possible Errors: [service].Error.InProgress
 					 [service].Error.InvalidArguments
-					 [service].Error.NotImplemented
-					 [service].Error.NotSupported

 		string RequestPhoneNumber()

@@ -47,13 +45,6 @@ Properties	array{string} Features [readonly]
 				"voice-recognition"
 				"attach-voice-tag"
 				"echo-canceling-and-noise-reduction"
-				"three-way-calling"
-				"release-all-held"
-				"release-specified-active-call"
-				"private-chat"
-				"create-multiparty"
-				"transfer"
-				"hf-indicators"

 		boolean InbandRinging [readonly]

@@ -66,7 +57,7 @@ Properties	array{string} Features [readonly]
 			to activate or deactivate the function from the HF, or
 			the AG could autonomously initiate it.

-		boolean EchoCancelingNoiseReduction [readwrite, optional]
+		boolean EchoCancelingNoiseReduction [readwrite]

 			Non-persistent Boolean property representing whether
 			echo canceling and noise reduction is enabled in the
@@ -79,14 +70,3 @@ Properties	array{string} Features [readonly]

 			The current charge level of the battery.  The value
 			can be between 0 and 5 respectively.
-
-		array{string} SubscriberNumbers [readonly]
-
-			List of subscriber numbers provided by the AG.
-
-		boolean DistractedDrivingReduction [readwrite, optional]
-
-			Non-persistent property representing whether
-			distracted driving reduction mode should be enabled in
-			the AG.  Support for this feature is optional on the
-			AG.
--- a/ofono/doc/network-api.txt
+++ b/ofono/doc/network-api.txt
@@ -57,11 +57,6 @@ Signals		PropertyChanged(string property, variant value)
 			This signal indicates a changed value of the given
 			property.

-		OperatorsChanged(array{object,dict})
-
-			Signal that gets emitted when operator list has
-			changed. It contains the current list of operators.
-
 Properties	string Mode [readonly]

 			The current registration mode. The default of this
--- a/ofono/doc/radio-settings-api.txt
+++ b/ofono/doc/radio-settings-api.txt
@@ -45,11 +45,6 @@ Properties	string TechnologyPreference [readwrite]
 				"umts"	Only UMTS used for radio access.
 				"lte"	Only LTE used for radio access.

-		array{string} AvailableTechnologies [readonly, optional]
-
-			List of values for TechnologyPreference property
-			supported by the modem.
-
 		string GsmBand [readwrite, optional]

 			Frequency band in which the modem is allowed to
--- a/ofono/doc/telit-modem.txt
+++ b/ofono/doc/telit-modem.txt
@@ -1,19 +0,0 @@
-oFono - Open Source Telephony
-*****************************
-
-Purpose
-=======
-The purpose of this document is to identify issues and configuration
-requirements with Telit's modems.
-
-HE910
-=====
-
-GPS:
-  To enable location reporting on the Telit HE910 the modem needs to be
-  switched to Port Configuration #8. Please refer to Telit's
-  'HE910 UE910 Family Ports Arrangements' section 4.1.3 for rationale and
-  'AT Commands Reference Guide' section 3.5.7.1.96 for specific AT command.
-  After setting the configuration, a power cycle is required.
-  Port Configiuration #8 is available since firmware 12.00.004. Firmware version
-  can be checked using 'AT+CGMR'.
--- a/ofono/drivers/atmodem/gprs-context.c
+++ b/ofono/drivers/atmodem/gprs-context.c
@@ -59,7 +59,6 @@ enum state {
 struct gprs_context_data {
 	GAtChat *chat;
 	unsigned int active_context;
-	GAtPPPAuthMethod auth_method;
 	char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
 	char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
 	GAtPPP *ppp;
@@ -155,7 +154,6 @@ static gboolean setup_ppp(struct ofono_gprs_context *gc)
 	if (getenv("OFONO_PPP_DEBUG"))
 		g_at_ppp_set_debug(gcd->ppp, ppp_debug, "PPP");

-	g_at_ppp_set_auth_method(gcd->ppp, gcd->auth_method);
 	g_at_ppp_set_credentials(gcd->ppp, gcd->username, gcd->password);

 	/* set connect and disconnect callbacks */
@@ -245,18 +243,6 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
 	memcpy(gcd->username, ctx->username, sizeof(ctx->username));
 	memcpy(gcd->password, ctx->password, sizeof(ctx->password));

-	/* We only support CHAP and PAP */
-	switch (ctx->auth_method) {
-	case OFONO_GPRS_AUTH_METHOD_CHAP:
-		gcd->auth_method = G_AT_PPP_AUTH_METHOD_CHAP;
-		break;
-	case OFONO_GPRS_AUTH_METHOD_PAP:
-		gcd->auth_method = G_AT_PPP_AUTH_METHOD_PAP;
-		break;
-	default:
-		goto error;
-	}
-
 	gcd->state = STATE_ENABLING;

 	if (gcd->vendor == OFONO_VENDOR_ZTE) {
@@ -282,34 +268,9 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,

 	len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", ctx->cid);

-	if (ctx->apn) {
-		switch (gcd->vendor) {
-		case OFONO_VENDOR_UBLOX:
-			/*
-			 * U-blox modems require a magic prefix to the APN to
-			 * specify the authentication method to use in the
-			 * network.  See UBX-13002752 - R21.
-			 *
-			 * As the response of the read command omits this magic
-			 * prefix, this is the least invasive place to set it.
-			 */
-			switch (ctx->auth_method) {
-			case OFONO_GPRS_AUTH_METHOD_CHAP:
-				snprintf(buf + len, sizeof(buf) - len - 3,
-						",\"CHAP:%s\"", ctx->apn);
-				break;
-			case OFONO_GPRS_AUTH_METHOD_PAP:
-				snprintf(buf + len, sizeof(buf) - len - 3,
-						",\"PAP:%s\"", ctx->apn);
-				break;
-			}
-			break;
-		default:
-			snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
-					ctx->apn);
-			break;
-		}
-	}
+	if (ctx->apn)
+		snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
+				ctx->apn);

 	if (g_at_chat_send(gcd->chat, buf, none_prefix,
 				at_cgdcont_cb, gc, NULL) > 0)
--- a/ofono/drivers/atmodem/gprs.c
+++ b/ofono/drivers/atmodem/gprs.c
@@ -282,44 +282,6 @@ static void telit_mode_notify(GAtResult *result, gpointer user_data)
 	ofono_gprs_bearer_notify(gprs, bearer);
 }

-static void ublox_ureg_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_gprs *gprs = user_data;
-	GAtResultIter iter;
-	gint state, bearer;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+UREG:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &state))
-		return;
-
-	switch (state) {
-	case 4:
-		bearer = 5;
-		break;
-	case 5:
-		bearer = 4;
-		break;
-	case 7:
-		/* XXX: reserved - assume none. */
-		bearer = 0;
-		break;
-	case 8:
-		bearer = 1;
-		break;
-	case 9:
-		bearer = 2;
-		break;
-	default:
-		bearer = state;
-	}
-
-	ofono_gprs_bearer_notify(gprs, bearer);
-}
-
 static void cpsb_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
@@ -354,12 +316,6 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer user_data)
 		g_at_chat_register(gd->chat, "^MODE:", huawei_mode_notify,
 						FALSE, gprs, NULL);
 		break;
-	case OFONO_VENDOR_UBLOX:
-		g_at_chat_register(gd->chat, "+UREG:", ublox_ureg_notify,
-						FALSE, gprs, NULL);
-		g_at_chat_send(gd->chat, "AT+UREG=1", none_prefix,
-						NULL, NULL, NULL);
-		break;
 	case OFONO_VENDOR_TELIT:
 		g_at_chat_register(gd->chat, "#PSNT:", telit_mode_notify,
 						FALSE, gprs, NULL);
--- a/ofono/drivers/atmodem/sim.c
+++ b/ofono/drivers/atmodem/sim.c
@@ -67,8 +67,6 @@ static const char *epin_prefix[] = { "*EPIN:", NULL };
 static const char *spic_prefix[] = { "+SPIC:", NULL };
 static const char *pct_prefix[] = { "#PCT:", NULL };
 static const char *pnnm_prefix[] = { "+PNNM:", NULL };
-static const char *qpinc_prefix[] = { "+QPINC:", NULL };
-static const char *upincnt_prefix[] = { "+UPINCNT:", NULL };
 static const char *none_prefix[] = { NULL };

 static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -969,90 +967,6 @@ error:
 	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 }

-static void at_qpinc_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_sim_pin_retries_cb_t cb = cbd->cb;
-	const char *final = g_at_result_final_response(result);
-	GAtResultIter iter;
-	struct ofono_error error;
-	int retries[OFONO_SIM_PASSWORD_INVALID];
-	size_t i;
-
-	decode_at_error(&error, final);
-
-	if (!ok) {
-		cb(&error, NULL, cbd->data);
-		return;
-	}
-
-	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
-		retries[i] = -1;
-
-	g_at_result_iter_init(&iter, result);
-
-	while (g_at_result_iter_next(&iter, "+QPINC:")) {
-		const char *name;
-		int pin, puk;
-
-		if (!g_at_result_iter_next_string(&iter, &name))
-			continue;
-		if (!g_at_result_iter_next_number(&iter, &pin))
-			continue;
-		if (!g_at_result_iter_next_number(&iter, &puk))
-			continue;
-
-		if (!strcmp(name, "SC")) {
-			retries[OFONO_SIM_PASSWORD_SIM_PIN] = pin;
-			retries[OFONO_SIM_PASSWORD_SIM_PUK] = puk;
-		} else if (!strcmp(name, "P2")) {
-			retries[OFONO_SIM_PASSWORD_SIM_PIN2] = pin;
-			retries[OFONO_SIM_PASSWORD_SIM_PUK2] = puk;
-		}
-	}
-
-	cb(&error, retries, cbd->data);
-}
-
-static void upincnt_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_sim_pin_retries_cb_t cb = cbd->cb;
-	const char *final = g_at_result_final_response(result);
-	GAtResultIter iter;
-	struct ofono_error error;
-	int retries[OFONO_SIM_PASSWORD_INVALID];
-	size_t i;
-	static enum ofono_sim_password_type password_types[] = {
-		OFONO_SIM_PASSWORD_SIM_PIN,
-		OFONO_SIM_PASSWORD_SIM_PIN2,
-		OFONO_SIM_PASSWORD_SIM_PUK,
-		OFONO_SIM_PASSWORD_SIM_PUK2,
-	};
-
-	decode_at_error(&error, final);
-
-	if (!ok) {
-		cb(&error, NULL, cbd->data);
-		return;
-	}
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+UPINCNT:"))
-		goto error;
-
-	BUILD_PIN_RETRIES_ARRAY(password_types, ARRAY_SIZE(password_types),
-				retries);
-
-	cb(&error, retries, cbd->data);
-
-	return;
-
-error:
-	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
-}
-
 static void at_pin_retries_query(struct ofono_sim *sim,
 					ofono_sim_pin_retries_cb_t cb,
 					void *data)
@@ -1114,16 +1028,6 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 					at_pnnm_cb, cbd, g_free) > 0)
 			return;
 		break;
-	case OFONO_VENDOR_QUECTEL:
-		if (g_at_chat_send(sd->chat, "AT+QPINC?", qpinc_prefix,
-					at_qpinc_cb, cbd, g_free) > 0)
-			return;
-		break;
-	case OFONO_VENDOR_UBLOX:
-		if (g_at_chat_send(sd->chat, "AT+UPINCNT", upincnt_prefix,
-					upincnt_cb, cbd, g_free) > 0)
-			return;
-		break;
 	default:
 		if (g_at_chat_send(sd->chat, "AT+CPINR", cpinr_prefixes,
 					at_cpinr_cb, cbd, g_free) > 0)
--- a/ofono/drivers/atmodem/vendor.h
+++ b/ofono/drivers/atmodem/vendor.h
@@ -42,7 +42,5 @@ enum ofono_vendor {
 	OFONO_VENDOR_SIMCOM_SIM900,
 	OFONO_VENDOR_ICERA,
 	OFONO_VENDOR_WAVECOM_Q2XXX,
-	OFONO_VENDOR_ALCATEL,
-	OFONO_VENDOR_QUECTEL,
-	OFONO_VENDOR_UBLOX,
+	OFONO_VENDOR_ALCATEL
 };
--- a/ofono/drivers/hfpmodem/handsfree.c
+++ b/ofono/drivers/hfpmodem/handsfree.c
@@ -49,7 +49,6 @@ static const char *bvra_prefix[] = { "+BVRA:", NULL };
 struct hf_data {
 	GAtChat *chat;
 	unsigned int ag_features;
-	unsigned int ag_chld_features;
 	int battchg_index;
 	guint register_source;
 };
@@ -125,108 +124,6 @@ static void ciev_notify(GAtResult *result, gpointer user_data)
 	ofono_handsfree_battchg_notify(hf, value);
 }

-static void cnum_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_handsfree_cnum_query_cb_t cb = cbd->cb;
-	GAtResultIter iter;
-	struct ofono_phone_number *list = NULL;
-	int num = 0;
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok)
-		goto out;
-
-	g_at_result_iter_init(&iter, result);
-
-	while (g_at_result_iter_next(&iter, "+CNUM:"))
-		num++;
-
-	if (num == 0)
-		goto out;
-
-	list = g_new0(struct ofono_phone_number, num);
-
-	g_at_result_iter_init(&iter, result);
-
-	for (num = 0; g_at_result_iter_next(&iter, "+CNUM:"); ) {
-		const char *number;
-		int service;
-		int type;
-
-		if (!g_at_result_iter_skip_next(&iter))
-			continue;
-
-		if (!g_at_result_iter_next_string(&iter, &number))
-			continue;
-
-		if (!g_at_result_iter_next_number(&iter, &type))
-			continue;
-
-		if (!g_at_result_iter_skip_next(&iter))
-			continue;
-
-		if (!g_at_result_iter_next_number(&iter, &service))
-			continue;
-
-		/* We are only interested in Voice services */
-		if (service != 4)
-			continue;
-
-		strncpy(list[num].number, number,
-				OFONO_MAX_PHONE_NUMBER_LENGTH);
-		list[num].number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
-		list[num].type = type;
-
-		DBG("cnum_notify:%s", list[num].number);
-		num++;
-	}
-
-out:
-	cb(&error, num, list, cbd->data);
-
-	g_free(list);
-
-}
-
-static void hfp_cnum_query(struct ofono_handsfree *hf,
-				ofono_handsfree_cnum_query_cb_t cb, void *data)
-{
-	struct hf_data *hd = ofono_handsfree_get_data(hf);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	if (g_at_chat_send(hd->chat, "AT+CNUM", NULL,
-					cnum_query_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, -1, NULL, data);
-}
-
-static void bind_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_handsfree *hf = user_data;
-	int hf_indicator;
-	int active;
-	GAtResultIter iter;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+BIND:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &hf_indicator))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &active))
-		return;
-
-	ofono_handsfree_hf_indicator_active_notify(hf, hf_indicator, active);
-}
-
 static gboolean hfp_handsfree_register(gpointer user_data)
 {
 	struct ofono_handsfree *hf = user_data;
@@ -237,13 +134,11 @@ static gboolean hfp_handsfree_register(gpointer user_data)
 	g_at_chat_register(hd->chat, "+BSIR:", bsir_notify, FALSE, hf, NULL);
 	g_at_chat_register(hd->chat, "+BVRA:", bvra_notify, FALSE, hf, NULL);
 	g_at_chat_register(hd->chat, "+CIEV:", ciev_notify, FALSE, hf, NULL);
-	g_at_chat_register(hd->chat, "+BIND:", bind_notify, FALSE, hf, NULL);

 	if (hd->ag_features & HFP_AG_FEATURE_IN_BAND_RING_TONE)
 		ofono_handsfree_set_inband_ringing(hf, TRUE);

 	ofono_handsfree_set_ag_features(hf, hd->ag_features);
-	ofono_handsfree_set_ag_chld_features(hf, hd->ag_chld_features);
 	ofono_handsfree_register(hf);

 	return FALSE;
@@ -254,13 +149,11 @@ static int hfp_handsfree_probe(struct ofono_handsfree *hf,
 {
 	struct hfp_slc_info *info = data;
 	struct hf_data *hd;
-	unsigned int i;

 	DBG("");
 	hd = g_new0(struct hf_data, 1);
 	hd->chat = g_at_chat_clone(info->chat);
 	hd->ag_features = info->ag_features;
-	hd->ag_chld_features = info->ag_mpty_features;

 	ofono_handsfree_set_data(hf, hd);

@@ -268,14 +161,6 @@ static int hfp_handsfree_probe(struct ofono_handsfree *hf,
 	ofono_handsfree_battchg_notify(hf,
 					info->cind_val[HFP_INDICATOR_BATTCHG]);

-	ofono_handsfree_set_hf_indicators(hf, info->hf_indicators,
-						info->num_hf_indicators);
-
-	for (i = 0; i < info->num_hf_indicators; i++)
-		ofono_handsfree_hf_indicator_active_notify(hf,
-			info->hf_indicators[i],
-			info->hf_indicator_active_map & (1 << i));
-
 	hd->register_source = g_idle_add(hfp_handsfree_register, hf);

 	return 0;
@@ -391,34 +276,13 @@ static void hfp_disable_nrec(struct ofono_handsfree *hf,
 	CALLBACK_WITH_FAILURE(cb, data);
 }

-static void hfp_hf_indicator(struct ofono_handsfree *hf,
-				unsigned short indicator, unsigned int value,
-				ofono_handsfree_cb_t cb, void *data)
-{
-	struct hf_data *hd = ofono_handsfree_get_data(hf);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[128];
-
-	snprintf(buf, sizeof(buf), "AT+BIEV=%u,%u", indicator, value);
-
-	if (g_at_chat_send(hd->chat, buf, NULL, hf_generic_set_cb,
-							cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
 static struct ofono_handsfree_driver driver = {
 	.name			= "hfpmodem",
 	.probe			= hfp_handsfree_probe,
 	.remove			= hfp_handsfree_remove,
-	.cnum_query		= hfp_cnum_query,
 	.request_phone_number	= hfp_request_phone_number,
 	.voice_recognition	= hfp_voice_recognition,
 	.disable_nrec		= hfp_disable_nrec,
-	.hf_indicator		= hfp_hf_indicator,
 };

 void hfp_handsfree_init(void)
--- a/ofono/drivers/hfpmodem/slc.c
+++ b/ofono/drivers/hfpmodem/slc.c
@@ -41,12 +41,10 @@
 #include "hfp.h"
 #include "slc.h"

-static const char *none_prefix[] = { NULL };
 static const char *brsf_prefix[] = { "+BRSF:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
 static const char *cmer_prefix[] = { "+CMER:", NULL };
 static const char *chld_prefix[] = { "+CHLD:", NULL };
-static const char *bind_prefix[] = { "+BIND:", NULL };

 struct slc_establish_data {
 	gint ref_count;
@@ -78,14 +76,6 @@ void hfp_slc_info_init(struct hfp_slc_info *info, guint16 version)

 	info->hf_features |= HFP_HF_FEATURE_CODEC_NEGOTIATION;

-	if (version < HFP_VERSION_1_7)
-		goto done;
-
-	info->hf_features |= HFP_HF_FEATURE_HF_INDICATORS;
-	memset(info->hf_indicators, 0, sizeof(info->hf_indicators));
-	info->num_hf_indicators = 0;
-	info->hf_indicator_active_map = 0;
-
 done:
 	memset(info->cind_val, 0, sizeof(info->cind_val));
 	memset(info->cind_pos, 0, sizeof(info->cind_pos));
@@ -117,104 +107,6 @@ static void slc_established(struct slc_establish_data *sed)
 	sed->connect_cb(sed->userdata);
 }

-static void bind_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct slc_establish_data *sed = user_data;
-	struct hfp_slc_info *info = sed->info;
-	GAtResultIter iter;
-	int hf_indicator;
-	int enabled;
-	unsigned int i;
-
-	if (!ok)
-		goto error;
-
-	g_at_result_iter_init(&iter, result);
-
-	while (g_at_result_iter_next(&iter, "+BIND:")) {
-		if (!g_at_result_iter_next_number(&iter, &hf_indicator))
-			goto error;
-
-		if (!g_at_result_iter_next_number(&iter, &enabled))
-			goto error;
-
-		ofono_info("AG wants indicator %d %s",
-				hf_indicator, enabled ? "enabled" : "disabled");
-
-		for (i = 0; i < info->num_hf_indicators; i++) {
-			if (info->hf_indicators[i] != hf_indicator)
-				continue;
-
-			info->hf_indicator_active_map |= enabled << i;
-		}
-
-		ofono_info("Active map: %02x", info->hf_indicator_active_map);
-	}
-
-	slc_established(sed);
-	return;
-
-error:
-	slc_failed(sed);
-}
-
-static void bind_support_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct slc_establish_data *sed = user_data;
-	struct hfp_slc_info *info = sed->info;
-	GAtResultIter iter;
-	int hf_indicator;
-
-	if (!ok)
-		goto error;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+BIND:"))
-		goto error;
-
-	if (!g_at_result_iter_open_list(&iter))
-		goto error;
-
-	while (g_at_result_iter_next_number(&iter, &hf_indicator)) {
-		if (info->num_hf_indicators >= 20)
-			goto error;
-
-		ofono_info("AG supports the following HF indicator: %d",
-				hf_indicator);
-
-		info->hf_indicators[info->num_hf_indicators] = hf_indicator;
-		info->num_hf_indicators += 1;
-	}
-
-	if (!g_at_result_iter_close_list(&iter))
-		goto error;
-
-	slc_establish_data_ref(sed);
-	g_at_chat_send(info->chat, "AT+BIND?", bind_prefix,
-				bind_query_cb, sed, slc_establish_data_unref);
-
-	return;
-
-error:
-	slc_failed(sed);
-}
-
-static void bind_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct slc_establish_data *sed = user_data;
-	struct hfp_slc_info *info = sed->info;
-
-	if (!ok) {
-		slc_failed(sed);
-		return;
-	}
-
-	slc_establish_data_ref(sed);
-	g_at_chat_send(info->chat, "AT+BIND=?", bind_prefix,
-				bind_support_cb, sed, slc_establish_data_unref);
-}
-
 static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct slc_establish_data *sed = user_data;
@@ -236,19 +128,19 @@ static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)

 	while (g_at_result_iter_next_unquoted_string(&iter, &str)) {
 		if (!strcmp(str, "0"))
-			ag_mpty_feature |= HFP_AG_CHLD_0;
+			ag_mpty_feature |= AG_CHLD_0;
 		else if (!strcmp(str, "1"))
-			ag_mpty_feature |= HFP_AG_CHLD_1;
+			ag_mpty_feature |= AG_CHLD_1;
 		else if (!strcmp(str, "1x"))
-			ag_mpty_feature |= HFP_AG_CHLD_1x;
+			ag_mpty_feature |= AG_CHLD_1x;
 		else if (!strcmp(str, "2"))
-			ag_mpty_feature |= HFP_AG_CHLD_2;
+			ag_mpty_feature |= AG_CHLD_2;
 		else if (!strcmp(str, "2x"))
-			ag_mpty_feature |= HFP_AG_CHLD_2x;
+			ag_mpty_feature |= AG_CHLD_2x;
 		else if (!strcmp(str, "3"))
-			ag_mpty_feature |= HFP_AG_CHLD_3;
+			ag_mpty_feature |= AG_CHLD_3;
 		else if (!strcmp(str, "4"))
-			ag_mpty_feature |= HFP_AG_CHLD_4;
+			ag_mpty_feature |= AG_CHLD_4;
 	}

 	if (!g_at_result_iter_close_list(&iter))
@@ -256,14 +148,7 @@ static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)

 	info->ag_mpty_features = ag_mpty_feature;

-	if ((info->ag_features & HFP_AG_FEATURE_HF_INDICATORS) &&
-			(info->hf_features & HFP_HF_FEATURE_HF_INDICATORS)) {
-		slc_establish_data_ref(sed);
-		g_at_chat_send(info->chat, "AT+BIND=1", none_prefix,
-				bind_set_cb, sed, slc_establish_data_unref);
-	} else
-		slc_established(sed);
-
+	slc_established(sed);
 	return;

 error:
--- a/ofono/drivers/hfpmodem/slc.h
+++ b/ofono/drivers/hfpmodem/slc.h
@@ -19,6 +19,14 @@
 *
 */

+#define AG_CHLD_0	0x01
+#define AG_CHLD_1	0x02
+#define AG_CHLD_1x	0x04
+#define AG_CHLD_2	0x08
+#define AG_CHLD_2x	0x10
+#define AG_CHLD_3	0x20
+#define AG_CHLD_4	0x40
+
 enum hfp_indicator {
 	HFP_INDICATOR_SERVICE = 0,
 	HFP_INDICATOR_CALL,
@@ -39,9 +47,6 @@ struct hfp_slc_info {
 	unsigned int hf_features;
 	unsigned char cind_pos[HFP_INDICATOR_LAST];
 	unsigned int cind_val[HFP_INDICATOR_LAST];
-	unsigned short hf_indicators[20];
-	unsigned char num_hf_indicators;
-	unsigned int hf_indicator_active_map;
 };

 void hfp_slc_info_init(struct hfp_slc_info *info, guint16 version);
--- a/ofono/drivers/hfpmodem/voicecall.c
+++ b/ofono/drivers/hfpmodem/voicecall.c
@@ -37,7 +37,6 @@
 #include <ofono/voicecall.h>

 #include "common.h"
-#include "hfp.h"

 #include "hfpmodem.h"
 #include "slc.h"
@@ -46,7 +45,6 @@
 #define POLL_CLCC_DELAY 50
 #define EXPECT_RELEASE_DELAY 50
 #define CLIP_TIMEOUT 500
-#define EXPECT_RING_DELAY 200

 static const char *none_prefix[] = { NULL };
 static const char *clcc_prefix[] = { "+CLCC:", NULL };
@@ -295,7 +293,7 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	 * we won't get indicator update if any of them is released by CHLD=1x.
 	 * So we have to poll it.
 	 */
-	if ((num_active > 1 || num_held > 1) && !vd->clcc_source)
+	if (num_active > 1 || num_held > 1)
 		vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL, poll_clcc,
 							vc);
 }
@@ -449,7 +447,7 @@ static void hfp_hold_all_active(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);

-	if (vd->ag_mpty_features & HFP_AG_CHLD_2) {
+	if (vd->ag_mpty_features & AG_CHLD_2) {
 		hfp_template("AT+CHLD=2", vc, generic_cb, 0, cb, data);
 		return;
 	}
@@ -463,7 +461,7 @@ static void hfp_release_all_held(struct ofono_voicecall *vc,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int held_status = 1 << CALL_STATUS_HELD;

-	if (vd->ag_mpty_features & HFP_AG_CHLD_0) {
+	if (vd->ag_mpty_features & AG_CHLD_0) {
 		hfp_template("AT+CHLD=0", vc, generic_cb, held_status,
 				cb, data);
 		return;
@@ -478,7 +476,7 @@ static void hfp_set_udub(struct ofono_voicecall *vc,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int incoming_or_waiting = 1 << CALL_STATUS_WAITING;

-	if (vd->ag_mpty_features & HFP_AG_CHLD_0) {
+	if (vd->ag_mpty_features & AG_CHLD_0) {
 		hfp_template("AT+CHLD=0", vc, generic_cb, incoming_or_waiting,
 				cb, data);
 		return;
@@ -500,19 +498,6 @@ static gboolean expect_release(gpointer user_data)
 	return FALSE;
 }

-static gboolean expect_ring(gpointer user_data)
-{
-	struct ofono_voicecall *vc = user_data;
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-
-	g_at_chat_send(vd->chat, "AT+CLCC", clcc_prefix,
-				clcc_poll_cb, vc, NULL);
-
-	vd->clip_source = 0;
-
-	return FALSE;
-}
-
 static void release_all_active_cb(gboolean ok, GAtResult *result,
 							gpointer user_data)
 {
@@ -543,7 +528,7 @@ static void hfp_release_all_active(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);

-	if (vd->ag_mpty_features & HFP_AG_CHLD_1) {
+	if (vd->ag_mpty_features & AG_CHLD_1) {
 		hfp_template("AT+CHLD=1", vc, release_all_active_cb, 0x1, cb,
 									data);
 		return;
@@ -574,7 +559,7 @@ static void hfp_release_specific(struct ofono_voicecall *vc, int id,
 	struct release_id_req *req = NULL;
 	char buf[32];

-	if (!(vd->ag_mpty_features & HFP_AG_CHLD_1x))
+	if (!(vd->ag_mpty_features & AG_CHLD_1x))
 		goto error;

 	req = g_try_new0(struct release_id_req, 1);
@@ -605,7 +590,7 @@ static void hfp_private_chat(struct ofono_voicecall *vc, int id,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	char buf[32];

-	if (vd->ag_mpty_features & HFP_AG_CHLD_2x) {
+	if (vd->ag_mpty_features & AG_CHLD_2x) {
 		snprintf(buf, sizeof(buf), "AT+CHLD=2%d", id);

 		hfp_template(buf, vc, generic_cb, 0, cb, data);
@@ -621,7 +606,7 @@ static void hfp_create_multiparty(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);

-	if (vd->ag_mpty_features & HFP_AG_CHLD_3) {
+	if (vd->ag_mpty_features & AG_CHLD_3) {
 		hfp_template("AT+CHLD=3", vc, generic_cb, 0, cb, data);

 		return;
@@ -640,7 +625,7 @@ static void hfp_transfer(struct ofono_voicecall *vc,
 	 */
 	unsigned int transfer = 0x1 | 0x2 | 0x4 | 0x8;

-	if (vd->ag_mpty_features & HFP_AG_CHLD_4) {
+	if (vd->ag_mpty_features & AG_CHLD_4) {
 		hfp_template("AT+CHLD=4", vc, generic_cb, transfer, cb, data);

 		return;
@@ -654,10 +639,8 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct change_state_req *req = g_try_new0(struct change_state_req, 1);
-	int len = strlen(dtmf);
 	char *buf;
 	int s;
-	int i;

 	if (req == NULL)
 		goto error;
@@ -667,15 +650,12 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 	req->data = data;
 	req->affected_types = 0;

-	/* strlen("AT") + (n-1) * strlen("+VTS=T;") + strlen(+VTS=T) + null */
-	buf = g_try_new(char, len * 7 + 2);
+	/* strlen("AT+VTS=) = 7 + NULL */
+	buf = g_try_new(char, strlen(dtmf) + 8);
 	if (buf == NULL)
 		goto error;

-	s = sprintf(buf, "AT+VTS=%c", dtmf[0]);
-
-	for (i = 1; i < len; i++)
-		s += sprintf(buf + s, ";+VTS=%c", dtmf[i]);
+	sprintf(buf, "AT+VTS=%s", dtmf);

 	s = g_at_chat_send(vd->chat, buf, none_prefix,
 				generic_cb, req, g_free);
@@ -771,11 +751,6 @@ static void ring_notify(GAtResult *result, gpointer user_data)
 	struct ofono_call *call;
 	GSList *waiting;

-	if (vd->clip_source) {
-		g_source_remove(vd->clip_source);
-		vd->clip_source = 0;
-	}
-
 	/* RING can repeat, ignore if we already have an incoming call */
 	if (g_slist_find_custom(vd->calls,
 				GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -1000,15 +975,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
 		break;

 	case 1:
-		/*
-		 * Handled in RING/CCWA most of the time, however sometimes
-		 * the call is answered before the RING unsolicited
-		 * notification has a chance to be generated on the device.
-		 * In this case, we use a failsafe CLCC poll in expect_ring
-		 * callback.
-		 * */
-		vd->clip_source = g_timeout_add(EXPECT_RING_DELAY,
-							expect_ring, vc);
+		/* Handled in RING/CCWA */
 		break;

 	case 2:
--- a/ofono/drivers/isimodem/cbs.c
+++ b/ofono/drivers/isimodem/cbs.c
@@ -134,9 +134,7 @@ static void routing_resp_cb(const GIsiMessage *msg, void *data)
 	struct cbs_data *cd = ofono_cbs_get_data(cbs);

 	if (!check_resp(msg, SMS_GSM_CB_ROUTING_RESP)) {
-		/* on shutdown, cbs is already being removed */
-		if (g_isi_msg_error(msg) != -ESHUTDOWN)
-			ofono_cbs_remove(cbs);
+		ofono_cbs_remove(cbs);
 		return;
 	}

--- a/ofono/drivers/rilmodem/call-forwarding.c
+++ b/ofono/drivers/rilmodem/call-forwarding.c
@@ -214,7 +214,7 @@ static void ril_query_cb(struct ril_msg *message, gpointer user_data)
 				nmbr_of_resps);

 		for (i = 0; i < nmbr_of_resps; i++) {
-			char *str = NULL;
+			const char *str;

 			list[i].status =  parcel_r_int32(&rilp);

@@ -225,14 +225,16 @@ static void ril_query_cb(struct ril_msg *message, gpointer user_data)
 			list[i].phone_number.type = parcel_r_int32(&rilp);

 			str = parcel_r_string(&rilp);
+
 			if (str) {
+
 				strncpy(list[i].phone_number.number,
 					str,
 					OFONO_MAX_PHONE_NUMBER_LENGTH);

 				list[i].phone_number.number[
 					OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
-				g_free(str);
+
 			}
 			list[i].time = parcel_r_int32(&rilp);
 		}
--- a/ofono/drivers/rilmodem/devinfo.c
+++ b/ofono/drivers/rilmodem/devinfo.c
@@ -42,8 +42,9 @@
 #include "rilmodem.h"

 /*
- * TODO: No public RIL api to query manufacturer or model.
- * Check where to get, could /system/build.prop be updated to have good values?
+ * TODO: The functions in this file are stubbed out, and
+ * will need to be re-worked to talk to the /gril layer
+ * in order to get real values from RILD.
 */
 guint timer_id;

@@ -51,14 +52,30 @@ static void ril_query_manufacturer(struct ofono_devinfo *info,
 					ofono_devinfo_query_cb_t cb,
 					void *data)
 {
-	CALLBACK_WITH_FAILURE(cb, "", data);
+	const char *attr = "Fake Manufacturer";
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct ofono_error error;
+	decode_ril_error(&error, "OK");
+
+	cb(&error, attr, cbd->data);
+
+	/* Note: this will need to change if cbd passed to gril layer */
+	g_free(cbd);
 }

 static void ril_query_model(struct ofono_devinfo *info,
 				ofono_devinfo_query_cb_t cb,
 				void *data)
 {
-	CALLBACK_WITH_FAILURE(cb, "", data);
+	const char *attr = "Fake Modem Model";
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct ofono_error error;
+	decode_ril_error(&error, "OK");
+
+	cb(&error, attr, cbd->data);
+
+	/* Note: this will need to change if cbd passed to gril layer */
+	g_free(cbd);
 }

 static void query_revision_cb(struct ril_msg *message, gpointer user_data)
--- a/ofono/drivers/rilmodem/gprs-context.c
+++ b/ofono/drivers/rilmodem/gprs-context.c
@@ -43,16 +43,8 @@
 #include "grilrequest.h"
 #include "grilunsol.h"

-#include "common.h"
-
 #include "rilmodem.h"

-enum data_call_state {
-	DATA_CALL_INACTIVE,
-	DATA_CALL_LINK_DOWN,
-	DATA_CALL_ACTIVE,
-};
-
 enum state {
 	STATE_IDLE,
 	STATE_ENABLING,
@@ -66,111 +58,24 @@ struct gprs_context_data {
 	gint active_rild_cid;
 	enum state state;
 	guint regid;
-	struct unsol_data_call_list *old_list;
-	guint prev_active_status;
 };

+static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
+						unsigned int id,
+						ofono_gprs_context_cb_t cb, void *data);
+
 static void set_context_disconnected(struct gprs_context_data *gcd)
 {
+	DBG("");
+
 	gcd->active_ctx_cid = -1;
 	gcd->active_rild_cid = -1;
 	gcd->state = STATE_IDLE;
 }

-static void ril_gprs_split_ip_by_protocol(char **ip_array,
-						char ***split_ip_addr,
-						char ***split_ipv6_addr,
-						char **ip_addr)
+static void disconnect_context(struct ofono_gprs_context *gc)
 {
-	const char ipv6_delimiter = ':';
-	const char ip_delimiter = '.';
-	int i;
-
-	*split_ipv6_addr = *split_ip_addr = NULL;
-	for (i=0; i< g_strv_length(ip_array); i++) {
-		if (strchr(ip_array[i], ipv6_delimiter)) {
-			if (*split_ipv6_addr == NULL) {
-				*split_ipv6_addr = g_strsplit(
-							ip_array[i], "/",2);
-			}
-		} else if (strchr(ip_array[i], ip_delimiter)) {
-			if (*split_ip_addr == NULL) {
-				*ip_addr = g_strdup(ip_array[i]);
-				*split_ip_addr = g_strsplit(
-							ip_array[i], "/", 2);
-			}
-		}
-	}
-}
-
-static void ril_gprs_split_gw_by_protocol(char **gw_array, char **ip_gw,
-								char **ipv6_gw)
-{
-	const char ipv6_delimiter = ':';
-	const char ip_delimiter = '.';
-	int i;
-
-	*ip_gw = *ipv6_gw = NULL;
-	for (i=0; i< g_strv_length(gw_array); i++) {
-		if (strchr(gw_array[i],ipv6_delimiter)) {
-			if (*ipv6_gw == NULL) {
-				*ipv6_gw = g_strdup(gw_array[i]);
-			}
-		} else if (strchr(gw_array[i],ip_delimiter)) {
-			if (*ip_gw == NULL)
-				*ip_gw = g_strdup(gw_array[i]);
-		}
-	}
-}
-
-static void ril_gprs_split_dns_by_protocol(char **dns_array, char ***dns_addr,
-							char ***dns_ipv6_addr)
-{
-	const char ipv6_delimiter = ':';
-	const char ip_delimiter = '.';
-	char *temp = NULL;
-	char *temp1 = NULL;
-	char *dnsip = NULL;
-	char *dnsipv6 = NULL;
-	int i, dnsip_len, dnsipv6_len;
-
-	dnsip_len = dnsipv6_len = 0;
-
-	for (i=0; i< g_strv_length(dns_array); i++) {
-		if (strchr(dns_array[i],ipv6_delimiter)) {
-			if (dnsipv6 == NULL) {
-				dnsipv6 = g_strdup(dns_array[i]);
-			} else {
-				temp = g_strconcat(dnsipv6, ",", NULL);
-				g_free(dnsipv6);
-				temp1 = g_strconcat(temp, dns_array[i], NULL);
-				g_free(temp);
-				dnsipv6 = temp1;
-			}
-			dnsipv6_len++;
-		} else if (strchr(dns_array[i],ip_delimiter)) {
-			if (dnsip == NULL) {
-				dnsip = g_strdup(dns_array[i]);
-			} else {
-				temp = g_strconcat(dnsip, ",", NULL);
-				g_free(dnsip);
-				temp1 = g_strconcat(temp, dns_array[i], NULL);
-				g_free(temp);
-				dnsip = temp1;
-
-			}
-			dnsip_len++;
-		}
-	}
-
-	if (dnsip)
-		*dns_addr = g_strsplit(dnsip, ",", dnsip_len);
-
-	if (dnsipv6)
-		*dns_ipv6_addr = g_strsplit(dnsipv6, ",", dnsipv6_len);
-
-	g_free(dnsip);
-	g_free(dnsipv6);
+	ril_gprs_context_deactivate_primary(gc, 0, NULL, NULL);
 }

 static void ril_gprs_context_call_list_changed(struct ril_msg *message,
@@ -180,8 +85,8 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct data_call *call = NULL;
 	struct unsol_data_call_list *unsol;
+	gboolean active_cid_found = FALSE;
 	gboolean disconnect = FALSE;
-	gboolean signal = FALSE;
 	GSList *iterator = NULL;
 	struct ofono_error error;

@@ -190,164 +95,28 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	if (error.type != OFONO_ERROR_TYPE_NO_ERROR)
 		goto error;

-	if (g_ril_unsol_cmp_dcl(unsol,gcd->old_list,gcd->active_rild_cid))
-		goto error;
-
-	g_ril_unsol_free_data_call_list(gcd->old_list);
-	gcd->old_list = unsol;
-
 	DBG("number of call in call_list_changed is: %d", unsol->num);

 	for (iterator = unsol->call_list; iterator; iterator = iterator->next) {
 		call = (struct data_call *) iterator->data;

-		/*
-		 * Every context receives notifications about all data calls
-		 * but should only handle its own.
-		 */
-		if (call->cid != gcd->active_rild_cid)
-			continue;
+		if (call->cid == gcd->active_rild_cid) {
+			active_cid_found = TRUE;

-		if (call->active == DATA_CALL_LINK_DOWN)
-			gcd->prev_active_status = call->active;
-
-		if (call->status != 0)
-			ofono_info("data call status:%d", call->status);
-
-		if (call->active == DATA_CALL_INACTIVE) {
-			disconnect = TRUE;
-			gcd->prev_active_status = call->active;
-			ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
-			break;
-		}
-
-		if (call->active == DATA_CALL_ACTIVE) {
-			int protocol = -1;
-
-			if (gcd->prev_active_status != DATA_CALL_LINK_DOWN)
-				signal = TRUE;
-
-			gcd->prev_active_status = call->active;
-
-			if (call->type)
-				protocol = ril_protocol_string_to_ofono_protocol(call->type);
-
-			if (call->ifname)
-				ofono_gprs_context_set_interface(gc,
-								call->ifname);
-
-			if (call->addresses) {
-				char **split_ip_addr = NULL;
-				char **ip_array = NULL;
-				char **split_ipv6_addr = NULL;
-				char *ip_addr = NULL;
-
-				/*addresses to an array*/
-				ip_array = g_strsplit(call->addresses, " ",-1);
-
-				/*pick 1 address of each protocol*/
-				ril_gprs_split_ip_by_protocol(ip_array,
-								&split_ip_addr,
-								&split_ipv6_addr,
-								&ip_addr);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IPV6)
-						&& split_ipv6_addr != NULL){
-
-					ofono_gprs_context_set_ipv6_address(gc,
-							split_ipv6_addr[0]);
-				}
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IP)
-						&& split_ip_addr != NULL) {
-
-					ofono_gprs_context_set_ipv4_netmask(gc,
-						ril_util_get_netmask(ip_addr));
-					ofono_gprs_context_set_ipv4_address(gc,
-							split_ip_addr[0], TRUE);
-				}
-
-				g_strfreev(split_ip_addr);
-				g_strfreev(split_ipv6_addr);
-				g_strfreev(ip_array);
-				g_free(ip_addr);
+			if (call->active == 0) {
+				disconnect = TRUE;
+				ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
 			}

-			if (call->gateways) {
-				char **gw_array = NULL;
-				char *ip_gw = NULL;
-				char *ipv6_gw = NULL;
-				/*addresses to an array*/
-				gw_array = g_strsplit(call->gateways, " ", -1);
-
-				/*pick 1 gw for each protocol*/
-				ril_gprs_split_gw_by_protocol(gw_array, &ip_gw,
-								&ipv6_gw);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IPV6)
-						&& ipv6_gw != NULL)
-					ofono_gprs_context_set_ipv6_gateway(gc,
-								ipv6_gw);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IP)
-						&& ip_gw != NULL)
-					ofono_gprs_context_set_ipv4_gateway(gc,
-								ip_gw);
-
-				g_strfreev(gw_array);
-				g_free(ip_gw);
-				g_free(ipv6_gw);
-			}
-
-			if (call->dnses) {
-				char **dns_array = NULL;
-				char **dns_ip = NULL;
-				char **dns_ipv6 = NULL;
-
-				/*addresses to an array*/
-				dns_array = g_strsplit(call->dnses, " ", -1);
-
-				/*split based on protocol*/
-				ril_gprs_split_dns_by_protocol(dns_array,
-								&dns_ip,
-								&dns_ipv6);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IPV6)
-						&& dns_ipv6 != NULL)
-					ofono_gprs_context_set_ipv6_dns_servers(
-						gc, (const char **) dns_ipv6);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IP)
-						&& dns_ip != NULL)
-					ofono_gprs_context_set_ipv4_dns_servers(
-						gc, (const char**)dns_ip);
-
-				g_strfreev(dns_ip);
-				g_strfreev(dns_ipv6);
-				g_strfreev(dns_array);
-			}
 			break;
 		}
 	}

-	if (disconnect) {
+	if (disconnect || active_cid_found == FALSE) {
 		ofono_error("Clearing active context");
 		set_context_disconnected(gcd);
-		gcd->old_list = NULL;
-		goto error;
 	}

-	if (signal)
-		ofono_gprs_context_signal_change(gc, gcd->active_ctx_cid);
-
-	return;
-
 error:
 	g_ril_unsol_free_data_call_list(unsol);
 }
@@ -361,12 +130,6 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	struct ofono_error error;
 	struct reply_setup_data_call *reply = NULL;
 	char **split_ip_addr = NULL;
-	char **split_ipv6_addr = NULL;
-	char* ip_addr = NULL;
-	char* ip_gw = NULL;
-	char* ipv6_gw = NULL;
-	char** dns_addr = NULL;
-	char** dns_ipv6_addr = NULL;

 	ofono_info("setting up data call");

@@ -386,7 +149,10 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	gcd->active_rild_cid = reply->cid;

 	if (error.type != OFONO_ERROR_TYPE_NO_ERROR) {
-		ofono_error("no active context. disconnect");
+		if (gcd->active_rild_cid != -1) {
+			ofono_error("no active context. disconnect");
+			disconnect_context(gc);
+		}
 		goto error;
 	}

@@ -398,16 +164,24 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 		error.type = OFONO_ERROR_TYPE_FAILURE;
 		error.error = reply->status;

+		set_context_disconnected(gcd);
 		goto error;
 	}

-	/*check the ip address protocol*/
-	ril_gprs_split_ip_by_protocol(reply->ip_addrs, &split_ip_addr,
-						&split_ipv6_addr, &ip_addr);
+	/*
+	 * TODO: consier moving this into parse_data_reply
+	 *
+	 * Note - the address may optionally include a prefix size
+	 * ( Eg. "/30" ).  As this confuses NetworkManager, we
+	 * explicitly strip any prefix after calculating the netmask.
+	 */
+	split_ip_addr = g_strsplit(reply->ip_addrs[0], "/", 2);

-	if (split_ip_addr == NULL && split_ipv6_addr == NULL) {
-		ofono_error("%s: No IP address returned",
-				__func__);
+	/* TODO: see note above re: invalid messages... */
+	if (split_ip_addr[0] == NULL) {
+		ofono_error("%s: invalid IP address field returned: %s",
+				__func__,
+				reply->ip_addrs[0]);

 		error.type = OFONO_ERROR_TYPE_FAILURE;
 		error.error = EINVAL;
@@ -420,55 +194,33 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)

 	ofono_gprs_context_set_interface(gc, reply->ifname);

-	ril_gprs_split_gw_by_protocol(reply->gateways, &ip_gw, &ipv6_gw);
-
-	ril_gprs_split_dns_by_protocol(reply->dns_addresses, &dns_addr,
-								&dns_ipv6_addr);
-
 	/* TODO:
-	 * RILD can return multiple addresses; oFono only supports setting
-	 * a single IPv4 and single IPV6 address. At this time, we only use
-	 * the first address. It's possible that a RIL may just specify
-	 * the end-points of the point-to-point connection, in which case this
-	 * code will need to changed to handle such a device.
+	 * RILD can return multiple addresses; oFono only supports
+	 * setting a single IPv4 address.  At this time, we only
+	 * use the first address.  It's possible that a RIL may
+	 * just specify the end-points of the point-to-point
+	 * connection, in which case this code will need to
+	 * changed to handle such a device.
 	 */
+	ofono_gprs_context_set_ipv4_netmask(gc,
+			ril_util_get_netmask(reply->ip_addrs[0]));

-	if (split_ipv6_addr != NULL &&
-			(reply->protocol == OFONO_GPRS_PROTO_IPV6 ||
-			reply->protocol == OFONO_GPRS_PROTO_IPV4V6)) {
+	ofono_gprs_context_set_ipv4_address(gc, split_ip_addr[0], TRUE);
+	ofono_gprs_context_set_ipv4_gateway(gc, reply->gateways[0]);

-		ofono_gprs_context_set_ipv6_address(gc, split_ipv6_addr[0]);
-		ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
-		ofono_gprs_context_set_ipv6_dns_servers(gc,
-						(const char **) dns_ipv6_addr);
-	}
+	ofono_gprs_context_set_ipv4_dns_servers(gc,
+						(const char **) reply->dns_addresses);

-	if (split_ip_addr != NULL &&
-			(reply->protocol == OFONO_GPRS_PROTO_IP ||
-			reply->protocol == OFONO_GPRS_PROTO_IPV4V6)) {
-		ofono_gprs_context_set_ipv4_netmask(gc,
-					ril_util_get_netmask(ip_addr));
-		ofono_gprs_context_set_ipv4_address(gc, split_ip_addr[0], TRUE);
-		ofono_gprs_context_set_ipv4_gateway(gc, ip_gw);
-		ofono_gprs_context_set_ipv4_dns_servers(gc,
-						(const char **) dns_addr);
-	}
 error:
 	g_ril_reply_free_setup_data_call(reply);
 	g_strfreev(split_ip_addr);
-	g_strfreev(split_ipv6_addr);
-	g_strfreev(dns_addr);
-	g_strfreev(dns_ipv6_addr);
-	g_free(ip_addr);
-	g_free(ip_gw);
-	g_free(ipv6_gw);

 	cb(&error, cbd->data);
 }

 static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
-				const struct ofono_gprs_primary_context *ctx,
-				ofono_gprs_context_cb_t cb, void *data)
+						const struct ofono_gprs_primary_context *ctx,
+						ofono_gprs_context_cb_t cb, void *data)
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct cb_data *cbd = cb_data_new(cb, data);
@@ -477,19 +229,9 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	struct ofono_error error;
 	int reqid = RIL_REQUEST_SETUP_DATA_CALL;
 	int ret = 0;
-	int netreg_status;
-	int roaming = NETWORK_REGISTRATION_STATUS_ROAMING;

 	ofono_info("Activating context: %d", ctx->cid);

-	/* Let's make sure that we aren't connecting when roaming not allowed */
-	netreg_status = get_current_network_status();
-	if (netreg_status == roaming) {
-		if (!ril_roaming_allowed() && (roaming
-				== check_if_really_roaming(netreg_status)))
-			goto exit;
-	}
-
 	cbd->user = gc;

 	/* TODO: implement radio technology selection. */
@@ -503,7 +245,6 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	request.username = g_strdup(ctx->username);
 	request.password = g_strdup(ctx->password);
 	request.auth_type = RIL_AUTH_BOTH;
-
 	request.protocol = ctx->proto;

 	if (g_ril_request_setup_data_call(gcd->ril,
@@ -532,7 +273,7 @@ error:
 	g_free(request.apn);
 	g_free(request.username);
 	g_free(request.password);
-exit:
+
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_SETUP_DATA_CALL failed.");

@@ -543,8 +284,7 @@ exit:
 	}
 }

-static void ril_deactivate_data_call_cb(struct ril_msg *message,
-						gpointer user_data)
+static void ril_deactivate_data_call_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_gprs_context_cb_t cb = cbd->cb;
@@ -582,8 +322,7 @@ static void ril_deactivate_data_call_cb(struct ril_msg *message,

 static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
 						unsigned int id,
-						ofono_gprs_context_cb_t cb,
-						void *data)
+						ofono_gprs_context_cb_t cb, void *data)
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct cb_data *cbd = NULL;
@@ -636,7 +375,6 @@ error:
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_DEACTIVATE_DATA_CALL failed.");
 		g_free(cbd);
-
 		if (cb)
 			CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -664,6 +402,7 @@ static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
 	set_context_disconnected(gcd);

 	ofono_gprs_context_set_data(gc, gcd);
+	gcd->regid = -1;

 	gcd->regid = g_ril_register(gcd->ril, RIL_UNSOL_DATA_CALL_LIST_CHANGED,
 					ril_gprs_context_call_list_changed, gc);
@@ -676,15 +415,14 @@ static void ril_gprs_context_remove(struct ofono_gprs_context *gc)

 	DBG("");

-	g_ril_unsol_free_data_call_list(gcd->old_list);
-
-	if (gcd->state != STATE_IDLE)
+	if (gcd->state != STATE_IDLE) {
 		ril_gprs_context_detach_shutdown(gc, 0);
+	}

 	ofono_gprs_context_set_data(gc, NULL);
-
+	
 	if (gcd->regid != -1)
-		g_ril_unregister(gcd->ril, gcd->regid);
+		g_ril_unregister(gcd->ril,gcd->regid);

 	g_ril_unref(gcd->ril);
 	g_free(gcd);
@@ -694,9 +432,9 @@ static struct ofono_gprs_context_driver driver = {
 	.name			= RILMODEM,
 	.probe			= ril_gprs_context_probe,
 	.remove			= ril_gprs_context_remove,
-	.activate_primary	= ril_gprs_context_activate_primary,
-	.deactivate_primary	= ril_gprs_context_deactivate_primary,
-	.detach_shutdown	= ril_gprs_context_detach_shutdown,
+	.activate_primary       = ril_gprs_context_activate_primary,
+	.deactivate_primary     = ril_gprs_context_deactivate_primary,
+	.detach_shutdown        = ril_gprs_context_detach_shutdown,
 };

 void ril_gprs_context_init(void)
--- a/ofono/drivers/rilmodem/gprs.c
+++ b/ofono/drivers/rilmodem/gprs.c
@@ -45,8 +45,6 @@
 #include "rilmodem.h"

 #include <ofono/netreg.h>
-#include <ofono/sim.h>
-#include "storage.h"

 /*
 * This module is the ofono_gprs_driver implementation for rilmodem.
@@ -69,18 +67,12 @@ struct gprs_data {
 	GRil *ril;
 	gboolean ofono_attached;
 	int max_cids;
-	int rild_status; /* Driver Status */
+	int rild_status;
+	gboolean notified;
 	guint registerid;
 	guint timer_id;
 };

-/* Following constants are purely to improve readability */
-static const int roaming = NETWORK_REGISTRATION_STATUS_ROAMING;
-static const int registered = NETWORK_REGISTRATION_STATUS_REGISTERED;
-
-/*if we have called ofono_gprs_register or not*/
-static gboolean ofono_registered;
-
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb,
 					void *data);
@@ -89,10 +81,7 @@ static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;

-	g_assert(message->req ==
-				RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);
-
-	DBG("");
+	g_assert(message->req == RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);

 	/* We need to notify core always to cover situations when
 	 * connection drops temporarily for example when user is
@@ -108,7 +97,6 @@ static gboolean ril_gprs_set_attached_callback(gpointer user_data)
 	ofono_gprs_cb_t cb = cbd->cb;
 	struct ofono_gprs *gprs = cbd->user;
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-
 	DBG("");

 	gd->timer_id = 0;
@@ -145,6 +133,7 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,

 	cbd->user = gprs;

+	ril_gprs_registration_status(gprs, NULL, NULL);
 	/*
 	* However we cannot respond immediately, since core sets the
 	* value of driver_attached after calling set_attached and that
@@ -155,30 +144,6 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 						cbd);
 }

-gboolean ril_roaming_allowed()
-{
-	GError *error;
-	error = NULL;
-	GKeyFile *settings;
-	struct ofono_sim *sim;
-
-	sim = get_sim();
-	const char *imsi = ofono_sim_get_imsi(sim);
-	settings = storage_open(imsi, "gprs");
-	gboolean roaming_allowed = g_key_file_get_boolean(settings,
-							"Settings",
-							"RoamingAllowed",
-							&error);
-
-	if (error)
-		g_error_free(error);
-
-	storage_close(imsi, "gprs", settings, FALSE);
-
-	DBG("roaming_allowed: %d", roaming_allowed);
-	return roaming_allowed;
-}
-
 static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -186,9 +151,9 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 	struct ofono_gprs *gprs = cbd->user;
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
 	struct ofono_error error;
-	int lac, ci, tech;
+	int status, lac, ci, tech;
 	int max_cids = 1;
-	int status = -1;
+	int id = RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED;

 	if (gd && message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
@@ -197,22 +162,24 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 				ril_error_to_string(message->error));
 		decode_ril_error(&error, "FAIL");
 		error.error = message->error;
-		goto exit;
+		status = -1;
+		goto error;
 	}

 	if (ril_util_parse_reg(gd->ril, message, &status,
 				&lac, &ci, &tech, &max_cids) == FALSE) {
 		ofono_error("Failure parsing data registration response.");
 		decode_ril_error(&error, "FAIL");
-		goto exit;
+		status = -1;
+		goto error;
 	}

-	if (status > 10)
-		status = status - 10;
-
-	if (!ofono_registered) {
+	if (gd->rild_status == -1) {
 		ofono_gprs_register(gprs);
-		ofono_registered = TRUE;
+
+		DBG("Starting to listen network status");
+		gd->registerid = g_ril_register(gd->ril,
+			id, ril_gprs_state_change, gprs);
 	}

 	if (max_cids > gd->max_cids) {
@@ -221,129 +188,70 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 		ofono_gprs_set_cid_range(gprs, 1, max_cids);
 	}

-	if (status == roaming)
+	ofono_info("data registration status is %d", status);
+
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
 		status = check_if_really_roaming(status);

-	/* Let's minimize logging */
-	if (status != gd->rild_status)
-		ofono_info("data reg changes %d (%d), attached %d",
-				status, gd->rild_status, gd->ofono_attached);
-
-	/* Must be attached if registered or roaming */
-	if ((gd->rild_status != registered) && (gd->rild_status != roaming)) {
-		if (status == registered)
-			gd->ofono_attached = TRUE;
-		else if ((status == roaming) && (ril_roaming_allowed() == TRUE))
+	if (gd->ofono_attached && !gd->notified) {
+		if (status == NETWORK_REGISTRATION_STATUS_ROAMING ||
+			status == NETWORK_REGISTRATION_STATUS_REGISTERED) {
+			DBG("connection becomes available");
 			gd->ofono_attached = TRUE;
+			ofono_gprs_status_notify(gprs, status);
+			gd->notified = TRUE;
+			gd->rild_status = status;
+		}
+		goto error;
 	}

-	if (!ofono_modem_get_online(ofono_gprs_get_modem(gprs)))
-		gd->ofono_attached = FALSE;
-
-	/* if unsolicitated and no state change let's not notify core */
-	if ((status == gd->rild_status) && gd->ofono_attached)
-		goto cb_out;
-
-	if (!gd->ofono_attached) {
-		if (!cb) {
-			if (status == roaming) {
-				if (ril_roaming_allowed() == FALSE)
-					ofono_gprs_detached_notify(gprs);
-
-				/*
-				 * This prevents core ending
-				 * into eternal loop with driver
-				 */
-				decode_ril_error(&error, "FAIL");
-			}
-
-			ofono_gprs_status_notify(gprs, status);
-
-		} else {
+	if (gd->ofono_attached &&
+			status != NETWORK_REGISTRATION_STATUS_SEARCHING) {
+		DBG("ofono attached, start faking responses");
+		if (status != NETWORK_REGISTRATION_STATUS_ROAMING) {
 			/*
-			 * This prevents core ending
-			 * into eternal loop with driver
-			 */
-			decode_ril_error(&error, "FAIL");
+			* Only core can succesfully drop the connection
+			* If we drop the connection from here it leads
+			* to race situation where core asks context
+			* deactivation and at the same time we get
+			* Registered notification from modem.
+			*/
+			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
 		}

-		gd->rild_status = status;
-		goto exit;
-	}
+		if (gd->registerid != -1)
+			g_ril_unregister(gd->ril, gd->registerid);
+		gd->registerid = -1;
+	} else {
+		/*
+		 * Client is not approving succesful result
+		 * This covers the situation when context is
+		 * active in roaming situation and client closes
+		 * it directly by calling RoamingAllowed in API
+		 */
+		DBG("data registration status is %d", status);

-	if (!cb)
-		ofono_gprs_status_notify(gprs, status);
+		if (status != NETWORK_REGISTRATION_STATUS_SEARCHING) {
+			DBG("ofono not attached, notify core");
+			status = NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
+			ofono_gprs_detached_notify(gprs);
+			gd->notified = FALSE;
+			gd->ofono_attached = FALSE;
+		} else if (gd->notified && check_if_ok_to_attach()) {
+			DBG("hide the searching state");
+			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
+			ofono_gprs_status_notify(gprs, status);
+			gd->ofono_attached = TRUE;
+		}
+	}

 	gd->rild_status = status;

-exit:
-	DBG("data reg status %d, rild_status %d, attached %d",
-		status, gd->rild_status, gd->ofono_attached);
-cb_out:
+error:
 	if (cb)
 		cb(&error, status, cbd->data);
 }

-static void ril_data_probe_reg_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_gprs *gprs = cbd->user;
-	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-	struct ofono_error error;
-	int status, lac, ci, tech;
-	int max_cids = 1;
-	int id = RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED;
-
-	DBG("");
-
-	if (!(gd && message->error == RIL_E_SUCCESS)) {
-		ofono_error("ril_data_reg_cb: reply failure: %s",
-				ril_error_to_string(message->error));
-		decode_ril_error(&error, "FAIL");
-		error.error = message->error;
-		status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
-		goto out;
-	}
-
-	decode_ril_error(&error, "OK");
-	status = -1;
-
-	if (ril_util_parse_reg(gd->ril, message, &status,
-				&lac, &ci, &tech, &max_cids) == FALSE) {
-		ofono_error("Failure parsing data registration response.");
-		decode_ril_error(&error, "FAIL");
-
-		if (status == -1)
-			status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
-
-		goto out;
-	}
-
-	if (status > 10)
-		status = status - 10;
-
-	ofono_gprs_register(gprs);
-
-	ofono_registered = TRUE;
-
-	if (max_cids > gd->max_cids) {
-		DBG("Setting max cids to %d", max_cids);
-		gd->max_cids = max_cids;
-		ofono_gprs_set_cid_range(gprs, 1, max_cids);
-	}
-
-	if (status == roaming)
-		status = check_if_really_roaming(status);
-
-out:
-	ofono_info("data reg status probed %d", status);
-
-	gd->registerid = g_ril_register(gd->ril,
-			id, ril_gprs_state_change, gprs);
-
-	gd->rild_status = status;
-}
-
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb,
 					void *data)
@@ -353,27 +261,20 @@ static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 	int request = RIL_REQUEST_DATA_REGISTRATION_STATE;
 	guint ret;

-	DBG("");
-
 	if (gd == NULL || cbd == NULL)
 		return;

 	cbd->user = gprs;

 	ret = g_ril_send(gd->ril, request,
-				NULL, 0,
-				((gd->rild_status == -1)
-				? ril_data_probe_reg_cb
-				: ril_data_reg_cb), cbd, g_free);
+				NULL, 0, ril_data_reg_cb, cbd, g_free);

 	g_ril_print_request_no_args(gd->ril, ret, request);

 	if (ret <= 0) {
-		ofono_error("Send RIL_REQUEST_DATA_RESTISTRATION_STATE fail.");
+		ofono_error("Send RIL_REQUEST_DATA_RESTISTRATION_STATE failed.");
 		g_free(cbd);
-
-		if (cb)
-			CALLBACK_WITH_FAILURE(cb, -1, data);
+		CALLBACK_WITH_FAILURE(cb, -1, data);
 	}
 }

@@ -391,11 +292,9 @@ static int ril_gprs_probe(struct ofono_gprs *gprs,
 	gd->ofono_attached = FALSE;
 	gd->max_cids = 0;
 	gd->rild_status = -1;
+	gd->notified = FALSE;
 	gd->registerid = -1;
 	gd->timer_id = 0;
-
-	ofono_registered = FALSE;
-
 	ofono_gprs_set_data(gprs, gd);

 	ril_gprs_registration_status(gprs, NULL, NULL);
--- a/ofono/drivers/rilmodem/network-registration.c
+++ b/ofono/drivers/rilmodem/network-registration.c
@@ -55,7 +55,6 @@ struct netreg_data {
 	guint nitz_timeout;
 	unsigned int vendor;
 	guint timer_id;
-	int corestatus; /* Registration status previously reported to core */
 };

 /* 27.007 Section 7.3 <stat> */
@@ -79,20 +78,25 @@ static void extract_mcc_mnc(const char *str, char *mcc, char *mnc)
 	mnc[OFONO_MAX_MNC_LENGTH] = '\0';
 }

+/*
+ * TODO: The functions in this file are stubbed out, and
+ * will need to be re-worked to talk to the /gril layer
+ * in order to get real values from RILD.
+ */
+
 static void ril_creg_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_netreg_status_cb_t cb = cbd->cb;
 	struct netreg_data *nd = cbd->user;
 	struct ofono_error error;
-	int status, logstatus, lac, ci, tech;
+	int status, lac, ci, tech;

 	DBG("");

 	if (message->error != RIL_E_SUCCESS) {
 		decode_ril_error(&error, "FAIL");
-		ofono_error("voice registration status query fail");
-		nd->corestatus = -1;
+		ofono_error("Failed to pull registration state");
 		cb(&error, -1, -1, -1, -1, cbd->data);
 		return;
 	}
@@ -101,31 +105,20 @@ static void ril_creg_cb(struct ril_msg *message, gpointer user_data)

 	if (ril_util_parse_reg(nd->ril, message, &status,
 				&lac, &ci, &tech, NULL) == FALSE) {
-		DBG("voice registration status parsing fail");
-		nd->corestatus = -1;
 		CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, cbd->data);
 		return;
 	}

+	DBG("voice registration status is %d", status);
+
 	if (status > 10)
 		status = status - 10;

-	logstatus = status;
-
 	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
 		status = check_if_really_roaming(status);

-	DBG("status:%d corestatus:%d", status, nd->corestatus);
+	ofono_info("voice registration status is %d", status);

-	if (status != logstatus)
-		ofono_info("voice registration modified %d (%d)",
-				status, logstatus);
-
-	if (nd->corestatus != status)
-		ofono_info("voice registration changes %d (%d)",
-				status, nd->corestatus);
-
-	nd->corestatus = status;
 	nd->tech = tech;
 	cb(&error, status, lac, ci, tech, cbd->data);
 }
@@ -135,16 +128,15 @@ static void ril_creg_notify(struct ofono_error *error, int status, int lac,
 {
 	struct ofono_netreg *netreg = user_data;

-	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
-		DBG("Error during status notification");
-		return;
-	}
+        if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+                DBG("Error during status notification");
+                return;
+        }

 	ofono_netreg_status_notify(netreg, status, lac, ci, tech);
 }

-static void ril_network_state_change(struct ril_msg *message,
-		gpointer user_data)
+static void ril_network_state_change(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
@@ -372,7 +364,6 @@ static void ril_cops_list_cb(struct ril_msg *message, gpointer user_data)

 	cb(&error, noperators, list, cbd->data);

-	g_free(list);
 	return;

 error:
@@ -414,8 +405,7 @@ static void ril_register_cb(struct ril_msg *message, gpointer user_data)
 		g_ril_print_response_no_args(nd->ril, message);

 	} else {
-		ofono_error("registration failed, ril result %d",
-				message->error);
+		ofono_error("registration failed");
 		decode_ril_error(&error, "FAIL");
 	}

@@ -431,8 +421,6 @@ static void ril_register_auto(struct ofono_netreg *netreg,
 	int ret;
 	cbd->user = nd;

-	ofono_info("nw select automatic");
-
 	ret = g_ril_send(nd->ril, request,
 				NULL, 0, ril_register_cb, cbd, g_free);

@@ -456,8 +444,6 @@ static void ril_register_manual(struct ofono_netreg *netreg,
 	int request = RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL;
 	int ret;

-	ofono_info("nw select manual: %s%s", mcc, mnc);
-
 	/* add *netreg_data to callback */
 	cbd->user = nd;

@@ -605,20 +591,14 @@ gint check_if_really_roaming(gint status)
 	struct sim_spdi *spdi = ofono_netreg_get_spdi(current_netreg);

 	if (spdi && net_mcc && net_mnc) {
-		if (sim_spdi_lookup(spdi, net_mcc, net_mnc)) {
-			ofono_info("voice reg: not roaming based on spdi");
+		if (sim_spdi_lookup(spdi, net_mcc, net_mnc))
 			return NETWORK_REGISTRATION_STATUS_REGISTERED;
-		} else
+		else
 			return status;
 	} else
 		return status;
 }

-gint get_current_network_status()
-{
-	return ofono_netreg_get_status(current_netreg);
-}
-
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
@@ -663,7 +643,6 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 	nd->time.year = -1;
 	nd->time.dst = 0;
 	nd->time.utcoff = 0;
-	nd->corestatus = -1;
 	current_netreg = netreg;

 	ofono_netreg_set_data(netreg, nd);
@@ -690,7 +669,6 @@ static void ril_netreg_remove(struct ofono_netreg *netreg)
 		g_source_remove(nd->nitz_timeout);

 	ofono_netreg_set_data(netreg, NULL);
-	current_netreg = NULL;

 	if (nd->timer_id > 0)
 		g_source_remove(nd->timer_id);
--- a/ofono/drivers/rilmodem/phonebook.c
+++ b/ofono/drivers/rilmodem/phonebook.c
@@ -6,6 +6,7 @@
 *  Copyright (C) ST-Ericsson SA 2010.
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
 *  Copyright (C) 2013 Jolla Ltd
+ *  Contact: Jussi Kangas <jussi.kangas@tieto.com>
 *
 *  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
@@ -344,7 +345,7 @@ void handle_anr(size_t len,const unsigned char *msg,char *anr,
 			prefix = 0;

 			if ((msg[2] & TON_MASK) ==
-				TON_INTERNATIONAL) {
+			    TON_INTERNATIONAL) {
 				anr[0] = '+';
 				prefix = 1;
 			}
@@ -517,7 +518,7 @@ void handle_ext1(struct pb_data *pbd, const unsigned char *msg,
 						list_entry->data;
 				if (entry) {
 					strcat(entry->anr,
-						ext_number);
+				       ext_number);
 			}
 		}
 	}
@@ -633,10 +634,8 @@ static void pb_adn_sim_data_cb(const struct ofono_error *error,
 	file_info = cbd_outer->user;
 	cbd = cbd_outer->data;

-	if (!cbd) {
-		g_free(cbd_outer);
+	if (!cbd)
 		return;
-		}

 	pb = cbd->user;
 	cb = cbd->cb;
@@ -719,10 +718,8 @@ static void pb_adn_sim_data_cb(const struct ofono_error *error,
 			g_slist_free(phonebook_entry_start);
 			g_slist_free(pb_files);
 			g_free(cbd_outer);
-			void *pb = cbd->data;
-			g_free(cbd);
 			DBG("Finally all PB data read");
-			CALLBACK_WITH_SUCCESS(cb, pb);
+			CALLBACK_WITH_SUCCESS(cb, cbd->data);
 			return;
 		}
 	}
@@ -747,6 +744,9 @@ static void pb_adn_sim_info_cb(const struct ofono_error *error,
 	if (!cbd)
 		goto error;

+	pb = cbd->user;
+	cb = cbd->cb;
+	pbd = ofono_phonebook_get_data(pb);
 	file_info = NULL;

 	if (!pbd)
@@ -789,12 +789,8 @@ static void pb_adn_sim_info_cb(const struct ofono_error *error,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 }

 static gboolean is_reading_required(uint8_t file_type)
@@ -827,28 +823,9 @@ static void pb_content_data_cb(const struct ofono_error *error,
 	if (extension_file_info)
 		file_info = decode_read_response(extension_file_info, sdata,
 						 length, pb);
-	else {
-	/*
-	 * These checks are crash hacks.
-	 * AFAIK there's a possibility that we end up here and pb_next is NULL
-	 * in case remove has been called while phonebook reading is in
-	 * process. If you find better solution to this issue feel free to
-	 * change this.
-	 */
-		if (pb_next == NULL) {
-			ofono_error("phonebook reading failed");
-			if (cbd){
-				void *pb = cbd->data;
-				g_free(cbd);
-				if(cb && pbd)
-					CALLBACK_WITH_FAILURE(cb, pb);
-				}
-			return;
-		}
-
+	else
 		file_info =
 			decode_read_response(pb_next->data, sdata, length, pb);
-	}

 	if (file_info) {
 		DBG("Reading extension file %04X, record %d, structure %d",
@@ -902,7 +879,7 @@ static void pb_content_data_cb(const struct ofono_error *error,
 				DBG("All data requested, start vCard creation");
 				while (list_entry) {
 					struct phonebook_entry *entry =
-							list_entry->data;
+					    list_entry->data;

 					if (entry) {
 						DBG("vCard:\nname=%s\n",
@@ -939,10 +916,8 @@ static void pb_content_data_cb(const struct ofono_error *error,

 				g_slist_free(phonebook_entry_start);
 				g_slist_free(pb_files);
-				void *pb = cbd->data;
-				g_free(cbd);
 				DBG("Finally all PB data read");
-				CALLBACK_WITH_SUCCESS(cb, pb);
+				CALLBACK_WITH_SUCCESS(cb, cbd->data);
 				return;
 			}

@@ -1007,12 +982,8 @@ static void pb_content_data_read(struct pb_data *pbd,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);

 out:
 	DBG("Exiting");
@@ -1085,11 +1056,9 @@ static void pb_content_info_cb(const struct ofono_error *error,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
+	if (cb && cbd) {
+		DBG("Error cbd=%p, pbd=%p, file_info=%p", cbd, pbd, file_info);
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}
 }

@@ -1204,12 +1173,8 @@ static void pb_reference_data_cb(const struct ofono_error *error,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 }

 static void pb_reference_info_cb(const struct ofono_error *error,
@@ -1260,12 +1225,8 @@ static void pb_reference_info_cb(const struct ofono_error *error,
 					pb_reference_data_cb, cbd);
 	return;
 error:
-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 }

 static void ril_export_entries(struct ofono_phonebook *pb,
@@ -1304,12 +1265,10 @@ static void ril_export_entries(struct ofono_phonebook *pb,

 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+	g_free(cbd);
 }

 static gboolean ril_delayed_register(gpointer user_data)
@@ -1357,7 +1316,7 @@ static struct ofono_phonebook_driver driver = {
 	.name				= "rilmodem",
 	.probe				= ril_phonebook_probe,
 	.remove				= ril_phonebook_remove,
-	.export_entries			= ril_export_entries
+	.export_entries		= ril_export_entries
 };

 void ril_phonebook_init(void)
--- a/ofono/drivers/rilmodem/radio-settings.c
+++ b/ofono/drivers/rilmodem/radio-settings.c
@@ -75,7 +75,7 @@ static void ril_set_rat_mode(struct ofono_radio_settings *rs,
 	int pref = rd->ratmode;
 	int ret = 0;

-	ofono_info("rat mode set %d", mode);
+	ofono_info("setting rat mode:%d", mode);

 	parcel_init(&rilp);

@@ -116,8 +116,6 @@ static void ril_force_rat_mode(struct radio_data *rd, int pref)
 	if (pref == rd->ratmode)
 		return;

-	DBG("pref ril rat mode %d, ril current %d", pref, rd->ratmode);
-
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 1);
 	parcel_w_int32(&rilp, rd->ratmode);
@@ -139,7 +137,7 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)

 	if (message->error == RIL_E_SUCCESS) {
 		ril_util_init_parcel(message, &rilp);
-		/* first item in int[] is len so let's skip that */
+		/*first item in int[] is len so let's skip that*/
 		parcel_r_int32(&rilp);
 		pref = parcel_r_int32(&rilp);

@@ -169,7 +167,6 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)
 		default:
 			break;
 		}
-		ofono_info("rat mode %d (ril %d)", mode, pref);
 		if (cb)
 			CALLBACK_WITH_SUCCESS(cb, mode, cbd->data);
 	} else {
@@ -290,7 +287,6 @@ static gboolean ril_get_net_config(struct radio_data *rsd)

 	storage_close(NULL, RIL_STORE, keyfile, TRUE);

-	DBG("needsconfig %d, rat mode %d", needsconfig, rsd->ratmode);
 	return needsconfig;
 }

--- a/ofono/drivers/rilmodem/rilutil.c
+++ b/ofono/drivers/rilmodem/rilutil.c
@@ -375,14 +375,7 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 	 * Do we just make a style-guide exception for PrintBuf operations?
 	 */
 	g_ril_append_print_buf(gril,
-				"card_state=%d,universal_pin_state=%d,gsm_umts_index=%d,cdma_index=%d,ims_index=%d, ",
-				status->card_state,
-				status->pin_state,
-				status->gsm_umts_index,
-				status->cdma_index,
-				status->ims_index);
-
-	DBG("card_state=%d, universal_pin_state=%d, gsm_umts_index=%d, cdma_index=%d, ims_index=%d",
+				"(card_state=%d,universal_pin_state=%d,gsm_umts_index=%d,cdma_index=%d,ims_index=%d, ",
 				status->card_state,
 				status->pin_state,
 				status->gsm_umts_index,
@@ -394,7 +387,6 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 	else
 		goto done;

-	DBG("sim num_apps: %d", status->num_apps);
 	if (status->num_apps > MAX_UICC_APPS) {
 		ofono_error("SIM error; too many apps: %d", status->num_apps);
 		status->num_apps = MAX_UICC_APPS;
@@ -411,8 +403,6 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 		apps[i]->app_type = parcel_r_int32(&rilp);
 		apps[i]->app_state = parcel_r_int32(&rilp);

-		DBG("app[%d]: app_type: %d, app_state: %d", i,
-				apps[i]->app_type, apps[i]->app_state);
 		/*
 		 * Consider RIL_APPSTATE_ILLEGAL also READY. Even if app state
 		 * is  RIL_APPSTATE_ILLEGAL (-1), ICC operations must be
@@ -447,16 +437,6 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 					apps[i]->pin_replaced,
 					apps[i]->pin1_state,
 					apps[i]->pin2_state);
-
-		DBG("app[%d]: type=%d, state=%d, perso_substate=%d, aid_ptr=%s, app_label_ptr=%s, pin1_replaced=%d, pin1=%d, pin2=%d",
-					i, apps[i]->app_type,
-					apps[i]->app_state,
-					apps[i]->perso_substate,
-					apps[i]->aid_str,
-					apps[i]->app_str,
-					apps[i]->pin_replaced,
-					apps[i]->pin1_state,
-					apps[i]->pin2_state);
 	}

 done:
@@ -626,10 +606,8 @@ gint ril_util_parse_sms_response(GRil *gril, struct ril_msg *message)
 	 */
 	mr = parcel_r_int32(&rilp);
 	ack_pdu = parcel_r_string(&rilp);
-
-	/* error: 3GPP 27.005, 3.2.5, -1 if unknown or not applicable */
 	error = parcel_r_int32(&rilp);
-	DBG("sms msg ref: %d, error: %d, ack_pdu: %s", mr, error, ack_pdu);
+

 	g_ril_append_print_buf(gril, "{%d,%s,%d}",
 				mr, ack_pdu, error);
--- a/ofono/drivers/rilmodem/rilutil.h
+++ b/ofono/drivers/rilmodem/rilutil.h
@@ -123,12 +123,8 @@ struct ofono_sim *get_sim();

 gint check_if_really_roaming(gint status);

-gboolean ril_roaming_allowed();
-
 gboolean check_if_ok_to_attach();

-gint get_current_network_status();
-
 void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps);

 struct cb_data {
@@ -153,7 +149,7 @@ static inline struct cb_data *cb_data_new2(void *user, void *cb,
 {
 	struct cb_data *ret;

-	ret = g_new0(struct cb_data, 1);
+	ret = g_try_new0(struct cb_data, 1);

 	if (ret) {
 		ret->cb = cb;
--- a/ofono/drivers/rilmodem/sim.c
+++ b/ofono/drivers/rilmodem/sim.c
@@ -97,12 +97,12 @@ struct sim_data {
 	guint app_type;
 	gchar *app_str;
 	guint app_index;
+	gboolean sim_registered;
 	enum ofono_sim_password_type passwd_type;
 	int retries[OFONO_SIM_PASSWORD_INVALID];
 	enum ofono_sim_password_type passwd_state;
+	guint card_state;
 	guint idle_id;
-	gboolean initialized;
-	gboolean removed;
 };

 static void ril_pin_change_state_cb(struct ril_msg *message,
@@ -126,8 +126,7 @@ static void set_path(struct sim_data *sd, struct parcel *rilp,
 	} else if (sd->app_type == RIL_APPTYPE_SIM) {
 		len = sim_ef_db_get_path_2g(fileid, db_path);
 	} else {
-		ofono_error("%s Unsupported app_type: 0%x", __func__,
-				sd->app_type);
+		ofono_error("Unsupported app_type: 0%x", sd->app_type);
 	}

 	if (len > 0) {
@@ -181,15 +180,6 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)

 	DBG("");

-	/* In case sim card has been removed prior to this callback has been
-	 * called we must not call the core call back method as otherwise the
-	 * core will crash.
-	 */
-	if (sd->removed == TRUE) {
-		ofono_error("%s RIL_CARDSTATE_ABSENT", __func__);
-		return;
-	}
-
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
@@ -204,15 +194,14 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)
 						&sw1,
 						&sw2,
 						&response_len)) == NULL) {
-		ofono_error("%s Can't parse SIM IO response", __func__);
+		ofono_error("Can't parse SIM IO response from RILD");
 		decode_ril_error(&error, "FAIL");
 		goto error;
 	}

 	if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
 		(sw1 == 0x90 && sw2 != 0x00)) {
-		ofono_error("%s invalid values: sw1: %02x sw2: %02x", __func__,
-				sw1, sw2);
+		ofono_error("invalid values: sw1: %02x sw2: %02x", sw1, sw2);
 		memset(&error, 0, sizeof(error));

 		/* TODO: fix decode_ril_error to take type & error */
@@ -235,7 +224,7 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)
 	}

 	if (!ok) {
-		ofono_error("%s parse response failed", __func__);
+		ofono_error("parse response failed");
 		decode_ril_error(&error, "FAIL");
 		goto error;
 	}
@@ -325,8 +314,8 @@ static void ril_file_io_cb(struct ril_msg *message, gpointer user_data)
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
-		ofono_error("%s RILD reply failure: %s", __func__,
-				ril_error_to_string(message->error));
+		ofono_error("RILD reply failure: %s",
+			    ril_error_to_string(message->error));
 		goto error;
 	}

@@ -336,7 +325,7 @@ static void ril_file_io_cb(struct ril_msg *message, gpointer user_data)
 						&sw1,
 						&sw2,
 						&response_len)) == NULL) {
-		ofono_error("%s Error parsing IO response", __func__);
+		ofono_error("Error parsing IO response");
 		goto error;
 	}

@@ -470,7 +459,7 @@ static void ril_imsi_cb(struct ril_msg *message, gpointer user_data)
 		DBG("GET IMSI reply - OK");
 		decode_ril_error(&error, "OK");
 	} else {
-		ofono_error("%s Reply failure: %s", __func__,
+		ofono_error("Reply failure: %s",
 			    ril_error_to_string(message->error));
 		decode_ril_error(&error, "FAIL");
 		cb(&error, NULL, cbd->data);
@@ -562,13 +551,8 @@ static void configure_active_app(struct sim_data *sd,
 					guint index)
 {
 	sd->app_type = app->app_type;
-
-	g_free(sd->aid_str);
 	sd->aid_str = g_strdup(app->aid_str);
-
-	g_free(sd->app_str);
 	sd->app_str = g_strdup(app->app_str);
-
 	sd->app_index = index;

 	DBG("setting aid_str (AID) to: %s", sd->aid_str);
@@ -637,11 +621,14 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 	guint search_index = -1;
 	struct parcel rilp;

-	DBG("%p", message);
+	DBG("");

-	if (ril_util_parse_sim_status(sd->ril, message, &status, apps) &&
+	if (ril_util_parse_sim_status(sd->ril, message,	&status, apps) &&
 		status.num_apps) {

+		DBG("num_apps: %d gsm_umts_index: %d", status.num_apps,
+			status.gsm_umts_index);
+
 		/* TODO(CDMA): need some kind of logic to
 		 * set the correct app_index,
 		 */
@@ -657,33 +644,58 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 			}
 		}

-		/*
-		 * ril_util_parse_sim_status returns true only when
-		 * card status is RIL_CARDSTATE_PRESENT so notify TRUE always.
-		 *
-		 * ofono_sim_inserted_notify skips and returns if
-		 * present/not_present status doesn't change from previous.
-		 */
-		ofono_sim_inserted_notify(sim, TRUE);
+		if (sd->sim_registered == FALSE) {
+			ofono_sim_register(sim);
+			sd->sim_registered = TRUE;
+		} else {
+			/* TODO: There doesn't seem to be any other
+			 * way to force the core SIM code to
+			 * recheck the PIN.
+			 * Wouldn't __ofono_sim_refresh be
+			 * more appropriate call here??
+			 * __ofono_sim_refresh(sim, NULL, TRUE, TRUE);
+			 */
+			DBG("sd->card_state:%u", sd->card_state);
+			if (sd->card_state != RIL_CARDSTATE_PRESENT) {
+				ofono_sim_inserted_notify(sim, TRUE);
+				sd->card_state = RIL_CARDSTATE_PRESENT;
+			}
+		}

-		sd->removed = FALSE;
+		if (current_passwd) {
+			if (!strcmp(current_passwd, defaultpasswd)) {
+				__ofono_sim_recheck_pin(sim);
+			} else if (sd->passwd_state !=
+						OFONO_SIM_PASSWORD_SIM_PIN) {
+				__ofono_sim_recheck_pin(sim);
+			} else if (sd->passwd_state ==
+						OFONO_SIM_PASSWORD_SIM_PIN) {
+				parcel_init(&rilp);

-		/* TODO: There doesn't seem to be any other
-		 * way to force the core SIM code to
-		 * recheck the PIN.
-		 * Wouldn't __ofono_sim_refresh be
-		 * more appropriate call here??
-		 * __ofono_sim_refresh(sim, NULL, TRUE, TRUE);
-		 */
-		__ofono_sim_recheck_pin(sim);
+				parcel_w_int32(&rilp,
+					ENTER_SIM_PIN_PARAMS);
+				parcel_w_string(&rilp, current_passwd);
+				parcel_w_string(&rilp, sd->aid_str);
+
+				g_ril_send(sd->ril,
+						RIL_REQUEST_ENTER_SIM_PIN,
+						rilp.data, rilp.size, NULL,
+						NULL, g_free);
+
+				parcel_free(&rilp);
+			}
+		} else {
+			__ofono_sim_recheck_pin(sim);
+		}

 		if (current_online_state == RIL_ONLINE_PREF) {

+			parcel_init(&rilp);
+
 			parcel_init(&rilp);
 			parcel_w_int32(&rilp, 1);
 			parcel_w_int32(&rilp, 1);

-			ofono_info("RIL_REQUEST_RADIO_POWER ON");
 			g_ril_send(sd->ril,
 					RIL_REQUEST_RADIO_POWER,
 					rilp.data,
@@ -701,14 +713,17 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 			current_online_state = RIL_ONLINE_PREF;

 		if (status.card_state == RIL_CARDSTATE_ABSENT) {
-			ofono_info("%s: RIL_CARDSTATE_ABSENT", __func__);
-
+			DBG("sd->card_state:%u,status.card_state:%u,",
+				sd->card_state, status.card_state);
 			ofono_sim_inserted_notify(sim, FALSE);
+			sd->card_state = RIL_CARDSTATE_ABSENT;

-			sd->removed = TRUE;
-			sd->initialized = FALSE;
+			if (current_passwd)
+				g_stpcpy(current_passwd, defaultpasswd);
 		}
 	}
+
+	/* TODO: if no SIM present, handle emergency calling. */
 }

 static int send_get_sim_status(struct ofono_sim *sim)
@@ -745,78 +760,16 @@ static void ril_query_pin_retries(struct ofono_sim *sim,
 	CALLBACK_WITH_SUCCESS(cb, sd->retries, data);
 }

-static void ril_query_passwd_state_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_sim *sim = cbd->user;
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	ofono_sim_passwd_cb_t cb = cbd->cb;
-	void *data = cbd->data;
-	struct sim_app *apps[MAX_UICC_APPS];
-	struct sim_status status;
-	guint i = 0;
-	guint search_index = -1;
-	gint state = ofono_sim_get_state(sim);
-
-	if (ril_util_parse_sim_status(sd->ril, message, &status, apps) &&
-		status.num_apps) {
-
-		/* TODO(CDMA): need some kind of logic to
-		 * set the correct app_index,
-		 */
-		search_index = status.gsm_umts_index;
-
-		for (i = 0; i < status.num_apps; i++) {
-			if (i == search_index &&
-				apps[i]->app_type != RIL_APPTYPE_UNKNOWN) {
-				current_active_app = apps[i]->app_type;
-				configure_active_app(sd, apps[i], i);
-				set_pin_lock_state(sim, apps[i]);
-				break;
-			}
-		}
-		ril_util_free_sim_apps(apps, status.num_apps);
-	}
-	DBG("passwd_state %u", sd->passwd_state);
-
-	/* if pin code required cannot be initialized yet*/
-	if (sd->passwd_state == OFONO_SIM_PASSWORD_SIM_PIN)
-		sd->initialized = FALSE;
-	/*
-	 * To prevent double call to sim_initialize_after_pin from
-	 * sim_pin_query_cb we must prevent calling sim_pin_query_cb
-	 * when !OFONO_SIM_STATE_READY && OFONO_SIM_PASSWORD_NONE
-	*/
-	if ((state == OFONO_SIM_STATE_READY) || (sd->initialized == FALSE) ||
-				(sd->passwd_state != OFONO_SIM_PASSWORD_NONE)){
-
-		if (sd->passwd_state == OFONO_SIM_PASSWORD_NONE)
-			sd->initialized = TRUE;
-
-		if (state == OFONO_SIM_STATE_LOCKED_OUT)
-			sd->initialized = FALSE;
-
-		if (sd->passwd_state == OFONO_SIM_PASSWORD_INVALID)
-			CALLBACK_WITH_FAILURE(cb, -1, data);
-		else
-			CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
-	}
-
-}
-
 static void ril_query_passwd_state(struct ofono_sim *sim,
 					ofono_sim_passwd_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new2(sim, cb, data);
-	int request = RIL_REQUEST_GET_SIM_STATUS;
-	guint ret;
-
-	ret = g_ril_send(sd->ril, request,
-			NULL, 0, ril_query_passwd_state_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(sd->ril, ret, request);
+	DBG("passwd_state %u", sd->passwd_state);

+	if (sd->passwd_state == OFONO_SIM_PASSWORD_INVALID)
+		CALLBACK_WITH_FAILURE(cb, -1, data);
+	else
+		CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
 }

 static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
@@ -847,6 +800,8 @@ static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
 		g_ril_print_response_no_args(sd->ril, message);

 	} else {
+		if (current_passwd)
+			g_stpcpy(current_passwd, defaultpasswd);
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}

@@ -864,6 +819,9 @@ static void ril_pin_send(struct ofono_sim *sim, const char *passwd,
 	sd->passwd_type = OFONO_SIM_PASSWORD_SIM_PIN;
 	cbd->user = sd;

+	if (current_passwd)
+		g_stpcpy(current_passwd, passwd);
+
 	parcel_init(&rilp);

 	parcel_w_int32(&rilp, ENTER_SIM_PIN_PARAMS);
@@ -951,6 +909,8 @@ static void ril_pin_change_state(struct ofono_sim *sim,
 	 */
 	switch (passwd_type) {
 	case OFONO_SIM_PASSWORD_SIM_PIN:
+		if (current_passwd)
+			g_stpcpy(current_passwd, passwd);
 		g_ril_append_print_buf(sd->ril, "(SC,");
 		parcel_w_string(&rilp, "SC");
 		break;
@@ -1032,6 +992,9 @@ static void ril_pin_send_puk(struct ofono_sim *sim,
 	sd->passwd_type = OFONO_SIM_PASSWORD_SIM_PUK;
 	cbd->user = sd;

+	if (current_passwd)
+		g_stpcpy(current_passwd, passwd);
+
 	parcel_init(&rilp);

 	parcel_w_int32(&rilp, ENTER_SIM_PUK_PARAMS);
@@ -1080,6 +1043,8 @@ static void ril_change_passwd(struct ofono_sim *sim,

 	if (passwd_type == OFONO_SIM_PASSWORD_SIM_PIN2)
 		request = RIL_REQUEST_CHANGE_SIM_PIN2;
+	else if (current_passwd)
+		g_stpcpy(current_passwd, new_passwd);

 	ret = g_ril_send(sd->ril, request, rilp.data, rilp.size,
 			ril_pin_change_state_cb, cbd, g_free);
@@ -1105,14 +1070,15 @@ static gboolean ril_sim_register(gpointer user)

 	DBG("");

-	ofono_sim_register(sim);
+	sd->idle_id = 0;

 	send_get_sim_status(sim);

-	sd->idle_id = 0;
-	sd->idle_id = g_ril_register(sd->ril,
-			RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED,
+	g_ril_register(sd->ril, RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED,
 			(GRilNotifyFunc) ril_sim_status_changed, sim);
+
+	/* TODO: should we also register for RIL_UNSOL_SIM_REFRESH? */
+
 	return FALSE;
 }

@@ -1127,6 +1093,13 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,

 	sd = g_new0(struct sim_data, 1);
 	sd->ril = g_ril_clone(ril);
+	sd->aid_str = NULL;
+	sd->app_str = NULL;
+	sd->app_type = RIL_APPTYPE_UNKNOWN;
+	sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
+	sd->passwd_type = OFONO_SIM_PASSWORD_NONE;
+	sd->sim_registered = FALSE;
+	sd->card_state = RIL_CARDSTATE_ABSENT;

 	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
 		sd->retries[i] = -1;
--- a/ofono/drivers/rilmodem/sms.c
+++ b/ofono/drivers/rilmodem/sms.c
@@ -38,18 +38,10 @@
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/sms.h>
-#include <ofono/types.h>
-#include <ofono/sim.h>
-
 #include "smsutil.h"
 #include "util.h"
+
 #include "rilmodem.h"
-#include "simutil.h"
-
-#define SIM_EFSMS_FILEID	0x6F3C
-#define EFSMS_LENGTH		176
-
-unsigned char path[4] = {0x3F, 0x00, 0x7F, 0x10};

 struct sms_data {
 	GRil *ril;
@@ -139,7 +131,7 @@ static void ril_csca_query_cb(struct ril_msg *message, gpointer user_data)
 		sca.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';

 		DBG("csca_query_cb: %s, %d", sca.number, sca.type);
-		g_free(temp_buf); /*g_utf16_to_utf8 used by parcel_r_string*/
+
 		cb(&error, &sca, cbd->data);
 	} else {
 		ofono_error("return value invalid");
@@ -242,8 +234,6 @@ static void ril_cmgs(struct ofono_sms *sms, const unsigned char *pdu,
 				submit_sms_cb, cbd, g_free);

 	g_ril_append_print_buf(sd->ril, "(%s)", tpdu);
-	g_free(tpdu);
-	tpdu = NULL;
 	g_ril_print_request(sd->ril, ret, request);

 	parcel_free(&rilp);
@@ -301,9 +291,6 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 	long ril_buf_len;
 	guchar *ril_data;

-	ril_pdu = NULL;
-	ril_data = NULL;
-
 	DBG("req: %d; data_len: %d", message->req, message->buf_len);

 	switch (message->req) {
@@ -336,8 +323,6 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 	ofono_info("sms received, smsc_len is %d", smsc_len);

 	g_ril_append_print_buf(sd->ril, "(%s)", ril_pdu);
-	g_free(ril_pdu);
-	ril_pdu = NULL;
 	g_ril_print_unsol(sd->ril, message);

 	if (message->req == RIL_UNSOL_RESPONSE_NEW_SMS) {
@@ -350,116 +335,16 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 						ril_buf_len - smsc_len);
 	}

-	g_free(ril_data);
-	ril_data = NULL;
-
 	ril_ack_delivery(sms, TRUE);

 	return;

 error:
-	g_free(ril_pdu);
-	ril_pdu = NULL;
-
-	g_free(ril_data);
-	ril_data = NULL;
-
 	ril_ack_delivery(sms, FALSE);

 	ofono_error("Unable to parse NEW_SMS notification");
 }

-static void ril_new_sms_on_sim_cb(struct ril_msg *message, gpointer user_data)
-{
-	DBG("");
-	if (message->error == RIL_E_SUCCESS)
-		ofono_info("sms deleted from sim");
-	else
-		ofono_error("deleting sms from sim failed");
-}
-
-static void ril_request_delete_sms_om_sim(struct ofono_sms *sms,int record)
-{
-	struct sms_data *data = ofono_sms_get_data(sms);
-	struct parcel rilp;
-	int request = RIL_REQUEST_DELETE_SMS_ON_SIM;
-	int ret;
-
-	DBG("Deleting record: %d", record);
-
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 1); /* Number of int32 values in array */
-	parcel_w_int32(&rilp, record);
-
-	ret = g_ril_send(data->ril, request, rilp.data,
-				rilp.size, ril_new_sms_on_sim_cb, NULL, NULL);
-
-	parcel_free(&rilp);
-
-	if (ret <= 0)
-		ofono_error("cannot delete sms from sim");
-}
-
-static void ril_read_sms_on_sim_cb(const struct ofono_error *error,
-					const unsigned char *sdata,
-					int length, void *data)
-{
-	struct cb_data *cbd = data;
-	struct ofono_sms *sms = cbd->user;
-	int record;
-	unsigned int smsc_len;
-
-	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
-		ofono_error("cannot read sms from sim");
-		goto exit;
-	}
-
-	/*
-	 * It seems when reading EFsms RIL returns the whole record including
-	 * the first status byte therefore we ignore that as we are only
-	 * interested of the following pdu
-	 */
-	/* The first octect in the pdu contains the SMSC address length
-	 * which is the X following octects it reads. We add 1 octet to
-	 * the read length to take into account this read octet in order
-	 * to calculate the proper tpdu length.
-	 */
-	smsc_len = sdata[1] + 1;
-
-	ofono_sms_deliver_notify(sms, sdata + 1, length - 1,
-				 length - smsc_len - 1);
-
-	record = (int)cbd->data;
-	ril_request_delete_sms_om_sim(sms,record);
-
-exit:
-	g_free(cbd);
-}
-
-static void ril_new_sms_on_sim(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_sms *sms = user_data;
-	struct parcel rilp;
-	int record;
-
-	ofono_info("new sms on sim");
-
-	ril_util_init_parcel(message, &rilp);
-
-	/* data length of the response */
-	record = parcel_r_int32(&rilp);
-
-	if (record > 0) {
-		record = parcel_r_int32(&rilp);
-		struct cb_data *cbd = cb_data_new2(sms, NULL, (void*)record);
-		DBG(":%d", record);
-		get_sim_driver()->read_file_linear(get_sim(), SIM_EFSMS_FILEID,
-						record, EFSMS_LENGTH, path,
-						sizeof(path),
-						ril_read_sms_on_sim_cb, cbd);
-	}
-}
-
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_sms *sms = user_data;
@@ -475,8 +360,6 @@ static gboolean ril_delayed_register(gpointer user_data)
 			ril_sms_notify, sms);
 	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT,
 			ril_sms_notify, sms);
-	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM,
-			ril_new_sms_on_sim, sms);

 	/* This makes the timeout a single-shot */
 	return FALSE;
--- a/ofono/drivers/rilmodem/stk.c
+++ b/ofono/drivers/rilmodem/stk.c
@@ -81,12 +81,11 @@ static void ril_stk_envelope(struct ofono_stk *stk, int length,
 	DBG("");

 	hex_envelope = encode_hex(command, length, 0);
+
 	DBG("rilmodem envelope: %s", hex_envelope);

 	parcel_init(&rilp);
 	parcel_w_string(&rilp, hex_envelope);
-	g_free(hex_envelope);
-	hex_envelope = NULL;

 	ret = g_ril_send(sd->ril, request,
 				rilp.data, rilp.size, ril_envelope_cb,
@@ -133,12 +132,11 @@ static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
 	DBG("");

 	hex_tr = encode_hex(resp, length, 0);
+
 	DBG("rilmodem terminal response: %s", hex_tr);

 	parcel_init(&rilp);
 	parcel_w_string(&rilp, hex_tr);
-	g_free(hex_tr);
-	hex_tr = NULL;

 	ret = g_ril_send(sd->ril, request,
 				rilp.data, rilp.size, ril_tr_cb,
@@ -196,9 +194,7 @@ static void ril_stk_pcmd_notify(struct ril_msg *message, gpointer user_data)
 			strlen(pcmd),
 			&len, -1);

-	g_free(pcmd);
 	ofono_stk_proactive_command_notify(stk, len, (const guchar *)pdu);
-	g_free(pdu);
 }

 static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
@@ -215,14 +211,13 @@ static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
 	ril_util_init_parcel(message, &rilp);
 	pcmd = parcel_r_string(&rilp);
 	DBG("pcmd: %s", pcmd);
+
 	pdu = decode_hex((const char *) pcmd,
 			strlen(pcmd),
 			&len, -1);
-	g_free(pcmd);
-	pcmd = NULL;
+
 	ofono_stk_proactive_command_handled_notify(stk, len,
 			(const guchar *)pdu);
-	g_free(pdu);
 }

 static void ril_stk_session_end_notify(struct ril_msg *message,
--- a/ofono/drivers/rilmodem/ussd.c
+++ b/ofono/drivers/rilmodem/ussd.c
@@ -68,37 +68,19 @@ static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
 	enum sms_charset charset;
 	int ret = -1;

-	ofono_info("send ussd, len:%d", len);
+	ofono_info("send ussd");

 	if (cbs_dcs_decode(dcs, NULL, NULL, &charset,
 					NULL, NULL, NULL)) {
 		if (charset == SMS_CHARSET_7BIT) {
 			unsigned char unpacked_buf[182] = "";
 			long written;
-			int length;

 			unpack_7bit_own_buf(pdu, len, 0, TRUE,
 					sizeof(unpacked_buf), &written, 0,
 					unpacked_buf);

 			if (written >= 1) {
-				/*
-				 * When USSD was packed, additional CR
-				   might have been added (according to
-				   23.038 6.1.2.3.1). So if the last
-				   character is CR, it should be removed
-				   here. And in addition written doesn't
-				   contain correct length...
-
-				   Over 2 characters long USSD string must
-				   end with # (checked in
-				   valid_ussd_string() ), so it should be
-				   safe to remove extra CR.
-				*/
-				length = strlen((char *)unpacked_buf);
-				if (length > 2 &&
-				    unpacked_buf[length-1] == '\r')
-					unpacked_buf[length-1] = 0;
 				struct parcel rilp;
 				parcel_init(&rilp);
 				parcel_w_string(&rilp, (char *)unpacked_buf);
@@ -167,9 +149,9 @@ static void ril_ussd_notify(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_ussd *ussd = user_data;
 	struct parcel rilp;
-	gchar *ussd_from_network = NULL;
-	gchar *type = NULL;
-	gint ussdtype = 0;
+	gchar *ussd_from_network;
+	gchar *type;
+	gint ussdtype;

 	ofono_info("ussd_received");

@@ -177,17 +159,13 @@ static void ril_ussd_notify(struct ril_msg *message, gpointer user_data)
 	parcel_r_int32(&rilp);
 	type = parcel_r_string(&rilp);
 	ussdtype = g_ascii_xdigit_value(*type);
-	g_free(type);
-	type = NULL;
 	ussd_from_network = parcel_r_string(&rilp);

-	/* ussd_from_network not freed because core does that if dcs is 0xFF */
-	if (ussd_from_network) {
-		DBG("ussd_received, length %d", strlen(ussd_from_network));
+	if (ussd_from_network)
 		ofono_ussd_notify(ussd, ussdtype, 0xFF,
 			(const unsigned char *)ussd_from_network,
 			strlen(ussd_from_network));
-	} else
+	else
 		ofono_ussd_notify(ussd, ussdtype, 0, NULL, 0);

 	return;
--- a/ofono/drivers/rilmodem/voicecall.c
+++ b/ofono/drivers/rilmodem/voicecall.c
@@ -45,7 +45,9 @@

 /* Amount of ms we wait between CLCC calls */
 #define POLL_CLCC_INTERVAL 300
+
 #define FLAG_NEED_CLIP 1
+
 #define MAX_DTMF_BUFFER 32

 struct voicecall_data {
@@ -276,8 +278,6 @@ static void generic_cb(struct ril_msg *message, gpointer user_data)
 	int request = RIL_REQUEST_GET_CURRENT_CALLS;
 	int ret;

-	ofono_info("request:%d",message->req);
-
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
@@ -382,17 +382,15 @@ static void ril_dial(struct ofono_voicecall *vc,
 	struct parcel rilp;
 	int request = RIL_REQUEST_DIAL;
 	int ret;
-	char *phstr = NULL;

-	phstr = (char *) phone_number_to_string(ph);
-	ofono_info("dialing \"%s\"", phstr);
+	ofono_info("dialing");

 	cbd->user = vc;

 	parcel_init(&rilp);

 	/* Number to dial */
-	parcel_w_string(&rilp, phstr);
+        parcel_w_string(&rilp, (char *) phone_number_to_string(ph));
 	/* CLIR mode */
 	parcel_w_int32(&rilp, clir);
 	/* USS, need it twice for absent */
@@ -525,7 +523,6 @@ static void ril_ss_notify(struct ril_msg *message, gpointer user_data)
 				strncpy(number.number, tmp_number,
 					OFONO_MAX_PHONE_NUMBER_LENGTH);

-			g_free(tmp_number);
 			DBG("RIL data: MT/MO: %i, code: %i, index: %i",
 				notification_type, code, index);
 		break;
@@ -679,13 +676,6 @@ static void ril_create_multiparty(struct ofono_voicecall *vc,
 		cb(&error, data);
 }

-static void ril_transfer(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	ril_template(RIL_REQUEST_EXPLICIT_CALL_TRANSFER, vc, generic_cb, 0,
-				NULL, 0, cb, data);
-}
-
 static void private_chat_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_error error;
@@ -891,13 +881,12 @@ static struct ofono_voicecall_driver driver = {
 	.release_specific		= ril_hangup_specific,
 	.send_tones			= ril_send_dtmf,
 	.create_multiparty		= ril_create_multiparty,
-	.transfer			= ril_transfer,
 	.private_chat			= ril_private_chat,
 	.swap_without_accept		= ril_swap_without_accept,
 	.hold_all_active		= ril_hold_all_active,
 	.release_all_held		= ril_release_all_held,
 	.set_udub			= ril_set_udub,
-	.release_all_active		= ril_release_all_active,
+	.release_all_active	= ril_release_all_active,
 };

 void ril_voicecall_init(void)
--- a/ofono/drivers/telitmodem/location-reporting.c
+++ b/ofono/drivers/telitmodem/location-reporting.c
@@ -1,315 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2014  Intel Corporation. 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.
- *
- *  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
-#include <config.h>
-#endif
-
-#define _GNU_SOURCE
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/location-reporting.h>
-
-#include "gatchat.h"
-#include "gatresult.h"
-#include "gattty.h"
-
-#include "telitmodem.h"
-
-static const char *none_prefix[] = { NULL };
-static const char *portcfg_prefix[] = { "#PORTCFG:", NULL };
-static const char *gpsctl_prefix[] = { "$GPSP:", NULL };
-
-struct gps_data {
-	GAtChat *chat;
-};
-
-static void telit_gps_disable_cb(gboolean ok, GAtResult *result,
-							gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_location_reporting *lr = cbd->user;
-	ofono_location_reporting_disable_cb_t cb = cbd->cb;
-
-	DBG("lr=%p, ok=%d", lr, ok);
-
-	if (!ok) {
-		struct ofono_error error;
-
-		decode_at_error(&error, g_at_result_final_response(result));
-		cb(&error, cbd->data);
-
-		return;
-	}
-
-	CALLBACK_WITH_SUCCESS(cb, cbd->data);
-}
-
-static void telit_location_reporting_disable(
-				struct ofono_location_reporting *lr,
-				ofono_location_reporting_disable_cb_t cb,
-				void *data)
-{
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	DBG("lr=%p", lr);
-
-	cbd->user = lr;
-
-	if (g_at_chat_send(gd->chat, "AT$GPSP=0", none_prefix,
-				telit_gps_disable_cb, cbd, g_free) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, data);
-
-	g_free(cbd);
-}
-
-static int enable_data_stream(struct ofono_location_reporting *lr)
-{
-	struct ofono_modem *modem;
-	const char *gps_dev;
-	GHashTable *options;
-	GIOChannel *channel;
-	int fd;
-
-	modem = ofono_location_reporting_get_modem(lr);
-	gps_dev = ofono_modem_get_string(modem, "GPS");
-
-	options = g_hash_table_new(g_str_hash, g_str_equal);
-	if (options == NULL)
-		return -1;
-
-	g_hash_table_insert(options, "Baud", "115200");
-
-	channel = g_at_tty_open(gps_dev, options);
-
-	g_hash_table_destroy(options);
-
-	if (channel == NULL)
-		return -1;
-
-	fd = g_io_channel_unix_get_fd(channel);
-
-	g_io_channel_set_close_on_unref(channel, FALSE);
-	g_io_channel_unref(channel);
-
-	return fd;
-}
-
-static void telit_gps_ctl_cb(gboolean ok, GAtResult *result,
-					gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_location_reporting_enable_cb_t cb = cbd->cb;
-	struct ofono_location_reporting *lr = cbd->user;
-	struct ofono_error error;
-	int fd;
-
-	DBG("lr=%p ok=%d", lr, ok);
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, -1, cbd->data);
-
-		return;
-	}
-
-	fd = enable_data_stream(lr);
-
-	if (fd < 0) {
-		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-
-		return;
-	}
-
-	cb(&error, fd, cbd->data);
-	close(fd);
-}
-
-static void telit_gps_enable_cb(gboolean ok, GAtResult *result,
-					gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_location_reporting_enable_cb_t cb = cbd->cb;
-	struct ofono_location_reporting *lr = cbd->user;
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct ofono_error error;
-
-	DBG("lr=%p ok=%d", lr, ok);
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, -1, cbd->data);
-
-		g_free(cbd);
-		return;
-	}
-
-	if (g_at_chat_send(gd->chat, "AT$GPSNMUN=1,0,0,0,0,0,0",
-				none_prefix, telit_gps_ctl_cb, cbd, g_free) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-	g_free(cbd);
-}
-
-static void telit_portcfg_check_cb(gboolean ok, GAtResult *result,
-					gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_location_reporting_enable_cb_t cb = cbd->cb;
-	struct ofono_location_reporting *lr = cbd->user;
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct ofono_error error;
-	int requested_portcfg, current_portcfg;
-	GAtResultIter iter;
-
-	DBG("lr=%p ok=%d", lr, ok);
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, -1, cbd->data);
-
-		g_free(cbd);
-		return;
-	}
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "#PORTCFG:"))
-		goto fail;
-
-	if (!g_at_result_iter_next_number(&iter, &requested_portcfg))
-		goto fail;
-
-	if (!g_at_result_iter_next_number(&iter, &current_portcfg))
-		goto fail;
-
-	if (current_portcfg != 8) {
-		ofono_warn("Unable to start GPS, modem configuration invalid");
-		ofono_warn("Refer to doc/telit-modem.txt section HE910/GPS");
-		goto fail;
-	}
-
-	if (g_at_chat_send(gd->chat, "AT$GPSP=1", none_prefix,
-				telit_gps_enable_cb, cbd, NULL) > 0)
-		return;
-
-fail:
-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-	g_free(cbd);
-}
-
-static void telit_location_reporting_enable(struct ofono_location_reporting *lr,
-					ofono_location_reporting_enable_cb_t cb,
-					void *data)
-{
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	DBG("lr=%p", lr);
-
-	cbd->user = lr;
-
-	if (g_at_chat_send(gd->chat, "AT#PORTCFG?", portcfg_prefix,
-				telit_portcfg_check_cb, cbd, NULL) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-	g_free(cbd);
-}
-
-static void telit_location_reporting_support_cb(gboolean ok, GAtResult *result,
-							gpointer user_data)
-{
-	struct ofono_location_reporting *lr = user_data;
-
-	if (!ok) {
-		ofono_location_reporting_remove(lr);
-
-		return;
-	}
-
-	ofono_location_reporting_register(lr);
-}
-
-static int telit_location_reporting_probe(struct ofono_location_reporting *lr,
-						unsigned int vendor, void *data)
-{
-	GAtChat *chat = data;
-	struct gps_data *gd;
-
-	gd = g_try_new0(struct gps_data, 1);
-	if (gd == NULL)
-		return -ENOMEM;
-
-	gd->chat = g_at_chat_clone(chat);
-
-	ofono_location_reporting_set_data(lr, gd);
-
-	g_at_chat_send(gd->chat, "AT$GPSP=?", gpsctl_prefix,
-					telit_location_reporting_support_cb,
-					lr, NULL);
-
-	return 0;
-}
-
-static void telit_location_reporting_remove(struct ofono_location_reporting *lr)
-{
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-
-	ofono_location_reporting_set_data(lr, NULL);
-
-	g_at_chat_unref(gd->chat);
-	g_free(gd);
-}
-
-static struct ofono_location_reporting_driver driver = {
-	.name			= "telitmodem",
-	.type			= OFONO_LOCATION_REPORTING_TYPE_NMEA,
-	.probe			= telit_location_reporting_probe,
-	.remove			= telit_location_reporting_remove,
-	.enable			= telit_location_reporting_enable,
-	.disable		= telit_location_reporting_disable,
-};
-
-void telit_location_reporting_init()
-{
-	ofono_location_reporting_driver_register(&driver);
-}
-
-void telit_location_reporting_exit()
-{
-	ofono_location_reporting_driver_unregister(&driver);
-}
--- a/ofono/drivers/telitmodem/telitmodem.c
+++ b/ofono/drivers/telitmodem/telitmodem.c
@@ -1,49 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. 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.
- *
- *  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
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gatchat.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-#include <ofono/types.h>
-
-#include "telitmodem.h"
-
-static int telitmodem_init(void)
-{
-	telit_location_reporting_init();
-
-	return 0;
-}
-
-static void telitmodem_exit(void)
-{
-	telit_location_reporting_exit();
-}
-
-OFONO_PLUGIN_DEFINE(telitmodem, "Telit modem driver", VERSION,
-			OFONO_PLUGIN_PRIORITY_DEFAULT,
-			telitmodem_init, telitmodem_exit)
--- a/ofono/drivers/telitmodem/telitmodem.h
+++ b/ofono/drivers/telitmodem/telitmodem.h
@@ -1,25 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. 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.
- *
- *  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
- *
- */
-
-#include <drivers/atmodem/atutil.h>
-
-extern void telit_location_reporting_init();
-extern void telit_location_reporting_exit();
--- a/ofono/gatchat/gatppp.c
+++ b/ofono/gatchat/gatppp.c
@@ -64,13 +64,11 @@ struct _GAtPPP {
 	struct pppcp_data *ipcp;
 	struct ppp_net *net;
 	struct ppp_chap *chap;
-	struct ppp_pap *pap;
 	GAtHDLC *hdlc;
 	gint mru;
 	gint mtu;
 	char username[256];
 	char password[256];
-	GAtPPPAuthMethod auth_method;
 	GAtPPPConnectFunc connect_cb;
 	gpointer connect_data;
 	GAtPPPDisconnectFunc disconnect_cb;
@@ -152,15 +150,13 @@ static inline gboolean ppp_drop_packet(GAtPPP *ppp, guint16 protocol)
 			return TRUE;
 		break;
 	case PPP_PHASE_AUTHENTICATION:
-		if (protocol != LCP_PROTOCOL && protocol != CHAP_PROTOCOL &&
-					protocol != PAP_PROTOCOL)
+		if (protocol != LCP_PROTOCOL && protocol != CHAP_PROTOCOL)
 			return TRUE;
 		break;
 	case PPP_PHASE_DEAD:
 		return TRUE;
 	case PPP_PHASE_NETWORK:
 		if (protocol != LCP_PROTOCOL && protocol != CHAP_PROTOCOL &&
-					protocol != PAP_PROTOCOL &&
 					protocol != IPCP_PROTO)
 			return TRUE;
 		break;
@@ -225,13 +221,6 @@ static void ppp_receive(const unsigned char *buf, gsize len, void *data)
 		break;
 	case IPCP_PROTO:
 		pppcp_process_packet(ppp->ipcp, packet, len - offset);
-		break;
-	case PAP_PROTOCOL:
-		if (ppp->pap)
-			ppp_pap_process_packet(ppp->pap, packet, len - offset);
-		else
-			pppcp_send_protocol_reject(ppp->lcp, buf, len);
-
 		break;
 	case CHAP_PROTOCOL:
 		if (ppp->chap) {
@@ -370,12 +359,6 @@ void ppp_set_auth(GAtPPP *ppp, const guint8* auth_data)
 	guint16 proto = get_host_short(auth_data);

 	switch (proto) {
-	case PAP_PROTOCOL:
-		if (ppp->pap)
-			ppp_pap_free(ppp->pap);
-
-		ppp->pap = ppp_pap_new(ppp);
-		break;
 	case CHAP_PROTOCOL:
 		if (ppp->chap)
 			ppp_chap_free(ppp->chap);
@@ -454,19 +437,10 @@ void ppp_ipcp_finished_notify(GAtPPP *ppp)

 void ppp_lcp_up_notify(GAtPPP *ppp)
 {
+	/* Wait for the peer to send us a challenge if we expect auth */
 	if (ppp->chap != NULL) {
-		/* Wait for the peer to send us a challenge. */
 		ppp_enter_phase(ppp, PPP_PHASE_AUTHENTICATION);
 		return;
-	} else if (ppp->pap != NULL) {
-		/* Try to send an Authenticate-Request and wait for reply. */
-		if (ppp_pap_start(ppp->pap) == TRUE)
-			ppp_enter_phase(ppp, PPP_PHASE_AUTHENTICATION);
-		else
-			/* It'll never work out. */
-			ppp_auth_notify(ppp, FALSE);
-
-		return;
 	}

 	/* Otherwise proceed as if auth succeeded */
@@ -614,22 +588,6 @@ const char *g_at_ppp_get_password(GAtPPP *ppp)
 	return ppp->password;
 }

-gboolean g_at_ppp_set_auth_method(GAtPPP *ppp, GAtPPPAuthMethod method)
-{
-	if (method != G_AT_PPP_AUTH_METHOD_CHAP &&
-					method != G_AT_PPP_AUTH_METHOD_PAP)
-		return FALSE;
-
-	ppp->auth_method = method;
-
-	return TRUE;
-}
-
-GAtPPPAuthMethod g_at_ppp_get_auth_method(GAtPPP *ppp)
-{
-	return ppp->auth_method;
-}
-
 void g_at_ppp_set_recording(GAtPPP *ppp, const char *filename)
 {
 	if (ppp == NULL)
@@ -769,9 +727,6 @@ void g_at_ppp_unref(GAtPPP *ppp)
 	else if (ppp->fd >= 0)
 		close(ppp->fd);

-	if (ppp->pap)
-		ppp_pap_free(ppp->pap);
-
 	if (ppp->chap)
 		ppp_chap_free(ppp->chap);

@@ -839,9 +794,6 @@ static GAtPPP *ppp_init_common(gboolean is_server, guint32 ip)
 	/* initialize IPCP state */
 	ppp->ipcp = ipcp_new(ppp, is_server, ip);

-	/* chap authentication by default */
-	ppp->auth_method = G_AT_PPP_AUTH_METHOD_CHAP;
-
 	return ppp;
 }

--- a/ofono/gatchat/gatppp.h
+++ b/ofono/gatchat/gatppp.h
@@ -43,11 +43,6 @@ typedef enum _GAtPPPDisconnectReason {
 	G_AT_PPP_REASON_LOCAL_CLOSE,	/* Normal user close */
 } GAtPPPDisconnectReason;

-typedef enum _GAtPPPAuthMethod {
-	G_AT_PPP_AUTH_METHOD_CHAP,
-	G_AT_PPP_AUTH_METHOD_PAP,
-} GAtPPPAuthMethod;
-
 typedef void (*GAtPPPConnectFunc)(const char *iface, const char *local,
 					const char *peer,
 					const char *dns1, const char *dns2,
@@ -79,9 +74,6 @@ gboolean g_at_ppp_set_credentials(GAtPPP *ppp, const char *username,
 const char *g_at_ppp_get_username(GAtPPP *ppp);
 const char *g_at_ppp_get_password(GAtPPP *ppp);

-gboolean g_at_ppp_set_auth_method(GAtPPP *ppp, GAtPPPAuthMethod method);
-GAtPPPAuthMethod g_at_ppp_get_auth_method(GAtPPP *ppp);
-
 void g_at_ppp_set_recording(GAtPPP *ppp, const char *filename);

 void g_at_ppp_set_server_info(GAtPPP *ppp, const char *remote_ip,
--- a/ofono/gatchat/ppp.h
+++ b/ofono/gatchat/ppp.h
@@ -22,7 +22,6 @@
 #include "ppp_cp.h"

 #define LCP_PROTOCOL	0xc021
-#define PAP_PROTOCOL	0xc023
 #define CHAP_PROTOCOL	0xc223
 #define IPCP_PROTO	0x8021
 #define IPV6CP_PROTO	0x8057
@@ -39,7 +38,6 @@

 struct ppp_chap;
 struct ppp_net;
-struct ppp_pap;

 struct ppp_header {
 	guint8 address;
@@ -111,13 +109,6 @@ void ppp_chap_free(struct ppp_chap *chap);
 void ppp_chap_process_packet(struct ppp_chap *chap, const guint8 *new_packet,
 				gsize len);

-/* PAP related functions */
-struct ppp_pap *ppp_pap_new(GAtPPP *ppp);
-void ppp_pap_free(struct ppp_pap *pap);
-gboolean ppp_pap_start(struct ppp_pap *pap);
-void ppp_pap_process_packet(struct ppp_pap *pap, const guint8 *new_packet,
-				gsize len);
-
 /* TUN / Network related functions */
 struct ppp_net *ppp_net_new(GAtPPP *ppp, int fd);
 const char *ppp_net_get_interface(struct ppp_net *net);
--- a/ofono/gatchat/ppp_auth.c
+++ b/ofono/gatchat/ppp_auth.c
@@ -54,38 +54,6 @@ enum chap_code {
 	FAILURE
 };

-struct pap_header {
-	guint8 code;
-	guint8 identifier;
-	guint16 length;
-	guint8 data[0];
-} __attribute__((packed));
-
-struct ppp_pap {
-	GAtPPP *ppp;
-	struct ppp_header *authreq;
-	guint16 authreq_len;
-	guint retry_timer;
-	guint retries;
-};
-
-enum pap_code {
-	PAP_REQUEST = 1,
-	PAP_ACK,
-	PAP_NAK
-};
-
-/*
- * RFC 1334 2.1.1:
- *   The Authenticate-Request packet MUST be repeated until a valid
- *   reply packet is received, or an optional retry counter expires.
- *
- * If we don't get a reply after this many attempts, we can safely
- * assume we're never going to get one.
- */
-#define PAP_MAX_RETRY	3  /* attempts */
-#define PAP_TIMEOUT	10 /* seconds */
-
 static void chap_process_challenge(struct ppp_chap *chap, const guint8 *packet)
 {
 	const struct chap_header *header = (const struct chap_header *) packet;
@@ -198,114 +166,3 @@ struct ppp_chap *ppp_chap_new(GAtPPP *ppp, guint8 method)

 	return chap;
 }
-
-void ppp_pap_process_packet(struct ppp_pap *pap, const guint8 *new_packet,
-				gsize len)
-{
-	guint8 code;
-
-	if (len < sizeof(struct pap_header))
-		return;
-
-	code = new_packet[0];
-
-	switch (code) {
-	case PAP_ACK:
-		g_source_remove(pap->retry_timer);
-		pap->retry_timer = 0;
-		ppp_auth_notify(pap->ppp, TRUE);
-		break;
-	case PAP_NAK:
-		g_source_remove(pap->retry_timer);
-		pap->retry_timer = 0;
-		ppp_auth_notify(pap->ppp, FALSE);
-		break;
-	default:
-		break;
-	}
-}
-
-static gboolean ppp_pap_timeout(gpointer user_data)
-{
-	struct ppp_pap *pap = (struct ppp_pap *)user_data;
-	struct pap_header *authreq;
-
-	if (++pap->retries >= PAP_MAX_RETRY) {
-		pap->retry_timer = 0;
-		ppp_auth_notify(pap->ppp, FALSE);
-		return FALSE;
-	}
-
-	/*
-	 * RFC 1334 2.2.1:
-	 * The Identifier field MUST be changed each time an
-	 * Authenticate-Request packet is issued.
-	 */
-	authreq = (struct pap_header *)&pap->authreq->info;
-	authreq->identifier++;
-
-	ppp_transmit(pap->ppp, (guint8 *)pap->authreq, pap->authreq_len);
-
-	return TRUE;
-}
-
-gboolean ppp_pap_start(struct ppp_pap *pap)
-{
-	struct pap_header *authreq;
-	struct ppp_header *packet;
-	const char *username = g_at_ppp_get_username(pap->ppp);
-	const char *password = g_at_ppp_get_password(pap->ppp);
-	guint16 length;
-
-	length = sizeof(*authreq) + strlen(username) + strlen(password) + 2;
-
-	packet = ppp_packet_new(length, PAP_PROTOCOL);
-	if (packet == NULL)
-		return FALSE;
-
-	pap->authreq = packet;
-	pap->authreq_len = length;
-
-	authreq = (struct pap_header *)&packet->info;
-	authreq->code = PAP_REQUEST;
-	authreq->identifier = 1;
-	authreq->length = htons(length);
-
-	authreq->data[0] = (unsigned char) strlen(username);
-	memcpy(authreq->data + 1, username, strlen(username));
-	authreq->data[strlen(username) + 1] = (unsigned char)strlen(password);
-	memcpy(authreq->data + 1 + strlen(username) + 1, password,
-					strlen(password));
-
-	/* Transmit the packet and schedule a retry. */
-	ppp_transmit(pap->ppp, (guint8 *)packet, length);
-	pap->retries = 0;
-	pap->retry_timer = g_timeout_add_seconds(PAP_TIMEOUT,
-							ppp_pap_timeout, pap);
-
-	return TRUE;
-}
-
-void ppp_pap_free(struct ppp_pap *pap)
-{
-	if (pap->retry_timer != 0)
-		g_source_remove(pap->retry_timer);
-
-	if (pap->authreq != NULL)
-		g_free(pap->authreq);
-
-	g_free(pap);
-}
-
-struct ppp_pap *ppp_pap_new(GAtPPP *ppp)
-{
-	struct ppp_pap *pap;
-
-	pap = g_try_new0(struct ppp_pap, 1);
-	if (pap == NULL)
-		return NULL;
-
-	pap->ppp = ppp;
-
-	return pap;
-}
--- a/ofono/gatchat/ppp_lcp.c
+++ b/ofono/gatchat/ppp_lcp.c
@@ -238,49 +238,25 @@ static enum rcr_result lcp_rcr(struct pppcp_data *pppcp,
 			guint8 method = option_data[2];
 			guint8 *option;

-			switch (g_at_ppp_get_auth_method(ppp)) {
-			case G_AT_PPP_AUTH_METHOD_CHAP:
-				if (proto == CHAP_PROTOCOL && method == MD5)
-					break;
+			if ((proto == CHAP_PROTOCOL) && (method == MD5))
+				break;

-				/*
-				 * Try to suggest CHAP/MD5.
-				 * Just reject if we run out of memory.
-				 */
-				option = g_try_malloc0(5);
-				if (option == NULL)
-					return RCR_REJECT;
+			/*
+			 * try to suggest CHAP & MD5.  If we are out
+			 * of memory, just reject.
+			 */

-				option[0] = AUTH_PROTO;
-				option[1] = 5;
-				put_network_short(&option[2], CHAP_PROTOCOL);
-				option[4] = MD5;
-				*new_options = option;
-				*new_len = 5;
+			option = g_try_malloc0(5);
+			if (option == NULL)
+				return RCR_REJECT;

-				return RCR_NAK;
-
-			case G_AT_PPP_AUTH_METHOD_PAP:
-				if (proto == PAP_PROTOCOL)
-					break;
-
-				/*
-				 * Try to suggest PAP.
-				 * Just reject if we run out of memory.
-				 */
-				option = g_try_malloc0(4);
-				if (option == NULL)
-					return RCR_REJECT;
-
-				option[0] = AUTH_PROTO;
-				option[1] = 4;
-				put_network_short(&option[2], PAP_PROTOCOL);
-				*new_options = option;
-				*new_len = 4;
-
-				return RCR_NAK;
-			}
-			break;
+			option[0] = AUTH_PROTO;
+			option[1] = 5;
+			put_network_short(&option[2], CHAP_PROTOCOL);
+			option[4] = MD5;
+			*new_options = option;
+			*new_len = 5;
+			return RCR_NAK;
 		}
 		case ACCM:
 		case PFC:
--- a/ofono/gdbus/client.c
+++ b/ofono/gdbus/client.c
@@ -51,14 +51,11 @@ struct GDBusClient {
 	GDBusWatchFunction connect_func;
 	void *connect_data;
 	GDBusWatchFunction disconn_func;
-	gboolean connected;
 	void *disconn_data;
 	GDBusMessageFunction signal_func;
 	void *signal_data;
 	GDBusProxyFunction proxy_added;
 	GDBusProxyFunction proxy_removed;
-	GDBusClientFunction ready;
-	void *ready_data;
 	GDBusPropertyFunction property_changed;
 	void *user_data;
 	GList *proxy_list;
@@ -728,93 +725,6 @@ gboolean g_dbus_proxy_set_property_basic(GDBusProxy *proxy,
 	return TRUE;
 }

-gboolean g_dbus_proxy_set_property_array(GDBusProxy *proxy,
-				const char *name, int type, const void *value,
-				size_t size, GDBusResultFunction function,
-				void *user_data, GDBusDestroyFunction destroy)
-{
-	struct set_property_data *data;
-	GDBusClient *client;
-	DBusMessage *msg;
-	DBusMessageIter iter, variant, array;
-	DBusPendingCall *call;
-	char array_sig[3];
-	char type_sig[2];
-
-	if (!proxy || !name || !value)
-		return FALSE;
-
-	if (!dbus_type_is_basic(type))
-		return FALSE;
-
-	client = proxy->client;
-	if (!client)
-		return FALSE;
-
-	data = g_try_new0(struct set_property_data, 1);
-	if (!data)
-		return FALSE;
-
-	data->function = function;
-	data->user_data = user_data;
-	data->destroy = destroy;
-
-	msg = dbus_message_new_method_call(client->service_name,
-						proxy->obj_path,
-						DBUS_INTERFACE_PROPERTIES,
-						"Set");
-	if (!msg) {
-		g_free(data);
-		return FALSE;
-	}
-
-	array_sig[0] = DBUS_TYPE_ARRAY;
-	array_sig[1] = (char) type;
-	array_sig[2] = '\0';
-
-	type_sig[0] = (char) type;
-	type_sig[1] = '\0';
-
-	dbus_message_iter_init_append(msg, &iter);
-	dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING,
-							&proxy->interface);
-	dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &name);
-
-	dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT,
-							array_sig, &variant);
-
-	dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY,
-							type_sig, &array);
-
-	if (dbus_type_is_fixed(type))
-		dbus_message_iter_append_fixed_array(&array, type, &value,
-									size);
-	else if (type == DBUS_TYPE_STRING || type == DBUS_TYPE_OBJECT_PATH) {
-		const char **str = (const char **) value;
-		size_t i;
-
-		for (i = 0; i < size; i++)
-			dbus_message_iter_append_basic(&array, type, &str[i]);
-	}
-
-	dbus_message_iter_close_container(&variant, &array);
-	dbus_message_iter_close_container(&iter, &variant);
-
-	if (g_dbus_send_message_with_reply(client->dbus_conn, msg,
-							&call, -1) == FALSE) {
-		dbus_message_unref(msg);
-		g_free(data);
-		return FALSE;
-	}
-
-	dbus_pending_call_set_notify(call, set_property_reply, data, g_free);
-	dbus_pending_call_unref(call);
-
-	dbus_message_unref(msg);
-
-	return TRUE;
-}
-
 struct method_call_data {
 	GDBusReturnFunction function;
 	void *user_data;
@@ -1072,9 +982,6 @@ static void parse_managed_objects(GDBusClient *client, DBusMessage *msg)

 		dbus_message_iter_next(&dict);
 	}
-
-	if (client->ready)
-		client->ready(client, client->ready_data);
 }

 static void get_managed_objects_reply(DBusPendingCall *call, void *user_data)
@@ -1147,8 +1054,6 @@ static void service_connect(DBusConnection *conn, void *user_data)

 	get_managed_objects(client);

-	client->connected = TRUE;
-
 	g_dbus_client_unref(client);
 }

@@ -1159,10 +1064,8 @@ static void service_disconnect(DBusConnection *conn, void *user_data)
 	g_list_free_full(client->proxy_list, proxy_free);
 	client->proxy_list = NULL;

-	if (client->disconn_func) {
+	if (client->disconn_func)
 		client->disconn_func(conn, client->disconn_data);
-		client->connected = FALSE;
-	}
 }

 static DBusHandlerResult message_filter(DBusConnection *connection,
@@ -1215,7 +1118,6 @@ GDBusClient *g_dbus_client_new(DBusConnection *connection,
 	client->dbus_conn = dbus_connection_ref(connection);
 	client->service_name = g_strdup(service);
 	client->base_path = g_strdup(path);
-	client->connected = FALSE;

 	client->match_rules = g_ptr_array_sized_new(1);
 	g_ptr_array_set_free_func(client->match_rules, g_free);
@@ -1290,11 +1192,7 @@ void g_dbus_client_unref(GDBusClient *client)

 	g_list_free_full(client->proxy_list, proxy_free);

-	/*
-	 * Don't call disconn_func twice if disconnection
-	 * was previously reported.
-	 */
-	if (client->disconn_func && client->connected)
+	if (client->disconn_func)
 		client->disconn_func(client->dbus_conn, client->disconn_data);

 	g_dbus_remove_watch(client->dbus_conn, client->watch);
@@ -1345,18 +1243,6 @@ gboolean g_dbus_client_set_signal_watch(GDBusClient *client,
 	return TRUE;
 }

-gboolean g_dbus_client_set_ready_watch(GDBusClient *client,
-				GDBusClientFunction ready, void *user_data)
-{
-	if (client == NULL)
-		return FALSE;
-
-	client->ready = ready;
-	client->ready_data = user_data;
-
-	return TRUE;
-}
-
 gboolean g_dbus_client_set_proxy_handlers(GDBusClient *client,
 					GDBusProxyFunction proxy_added,
 					GDBusProxyFunction proxy_removed,
--- a/ofono/gdbus/gdbus.h
+++ b/ofono/gdbus/gdbus.h
@@ -329,11 +329,6 @@ gboolean g_dbus_proxy_set_property_basic(GDBusProxy *proxy,
 				GDBusResultFunction function, void *user_data,
 				GDBusDestroyFunction destroy);

-gboolean g_dbus_proxy_set_property_array(GDBusProxy *proxy,
-				const char *name, int type, const void *value,
-				size_t size, GDBusResultFunction function,
-				void *user_data, GDBusDestroyFunction destroy);
-
 typedef void (* GDBusSetupFunction) (DBusMessageIter *iter, void *user_data);
 typedef void (* GDBusReturnFunction) (DBusMessage *message, void *user_data);

@@ -342,7 +337,6 @@ gboolean g_dbus_proxy_method_call(GDBusProxy *proxy, const char *method,
 				GDBusReturnFunction function, void *user_data,
 				GDBusDestroyFunction destroy);

-typedef void (* GDBusClientFunction) (GDBusClient *client, void *user_data);
 typedef void (* GDBusProxyFunction) (GDBusProxy *proxy, void *user_data);
 typedef void (* GDBusPropertyFunction) (GDBusProxy *proxy, const char *name,
 					DBusMessageIter *iter, void *user_data);
@@ -365,8 +359,7 @@ gboolean g_dbus_client_set_disconnect_watch(GDBusClient *client,
 				GDBusWatchFunction function, void *user_data);
 gboolean g_dbus_client_set_signal_watch(GDBusClient *client,
 				GDBusMessageFunction function, void *user_data);
-gboolean g_dbus_client_set_ready_watch(GDBusClient *client,
-				GDBusClientFunction ready, void *user_data);
+
 gboolean g_dbus_client_set_proxy_handlers(GDBusClient *client,
 					GDBusProxyFunction proxy_added,
 					GDBusProxyFunction proxy_removed,
--- a/ofono/gdbus/mainloop.c
+++ b/ofono/gdbus/mainloop.c
@@ -30,6 +30,8 @@

 #include "gdbus.h"

+#define DISPATCH_TIMEOUT  0
+
 #define info(fmt...)
 #define error(fmt...)
 #define debug(fmt...)
@@ -68,6 +70,8 @@ static gboolean message_dispatch(void *data)
 {
 	DBusConnection *conn = data;

+	dbus_connection_ref(conn);
+
 	/* Dispatch messages */
 	while (dbus_connection_dispatch(conn) == DBUS_DISPATCH_DATA_REMAINS);

@@ -80,7 +84,7 @@ static inline void queue_dispatch(DBusConnection *conn,
 						DBusDispatchStatus status)
 {
 	if (status == DBUS_DISPATCH_DATA_REMAINS)
-		g_idle_add(message_dispatch, dbus_connection_ref(conn));
+		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch, conn);
 }

 static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
@@ -90,14 +94,13 @@ static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
 	DBusDispatchStatus status;
 	DBusConnection *conn;

+	conn = dbus_connection_ref(info->conn);
+
 	if (cond & G_IO_IN)  flags |= DBUS_WATCH_READABLE;
 	if (cond & G_IO_OUT) flags |= DBUS_WATCH_WRITABLE;
 	if (cond & G_IO_HUP) flags |= DBUS_WATCH_HANGUP;
 	if (cond & G_IO_ERR) flags |= DBUS_WATCH_ERROR;

-	/* Protect connection from being destroyed by dbus_watch_handle */
-	conn = dbus_connection_ref(info->conn);
-
 	dbus_watch_handle(info->watch, flags);

 	status = dbus_connection_get_dispatch_status(conn);
--- a/ofono/gdbus/object.c
+++ b/ofono/gdbus/object.c
@@ -1088,6 +1088,7 @@ static const GDBusMethodTable introspect_methods[] = {
 static void append_interfaces(struct generic_data *data, DBusMessageIter *iter)
 {
 	DBusMessageIter array;
+	GSList *l;

 	dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
 				DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
@@ -1099,7 +1100,12 @@ static void append_interfaces(struct generic_data *data, DBusMessageIter *iter)
 				DBUS_DICT_ENTRY_END_CHAR_AS_STRING
 				DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &array);

-	g_slist_foreach(data->interfaces, append_interface, &array);
+	for (l = data->interfaces; l != NULL; l = l->next) {
+		if (g_slist_find(data->added, l->data))
+			continue;
+
+		append_interface(l->data, &array);
+	}

 	dbus_message_iter_close_container(iter, &array);
 }
@@ -1247,8 +1253,6 @@ static struct generic_data *object_path_ref(DBusConnection *connection,

 	if (!dbus_connection_register_object_path(connection, path,
 						&generic_table, data)) {
-		dbus_connection_unref(data->conn);
-		g_free(data->path);
 		g_free(data->introspect);
 		g_free(data);
 		return NULL;
--- a/ofono/gdbus/watch.c
+++ b/ofono/gdbus/watch.c
@@ -362,7 +362,6 @@ static void service_data_free(struct service_data *data)
 	callback->data = NULL;
 }

-/* Returns TRUE if data is freed */
 static gboolean filter_data_remove_callback(struct filter_data *data,
 						struct filter_callback *cb)
 {
@@ -384,7 +383,7 @@ static gboolean filter_data_remove_callback(struct filter_data *data,
 	/* Don't remove the filter if other callbacks exist or data is lock
 	 * processing callbacks */
 	if (data->callbacks || data->lock)
-		return FALSE;
+		return TRUE;

 	if (data->registered && !remove_match(data))
 		return FALSE;
@@ -406,9 +405,7 @@ static DBusHandlerResult signal_filter(DBusConnection *connection,

 		if (cb->signal_func && !cb->signal_func(connection, message,
 							cb->user_data)) {
-			if (filter_data_remove_callback(data, cb))
-				break;
-
+			filter_data_remove_callback(data, cb);
 			continue;
 		}

@@ -492,9 +489,7 @@ static DBusHandlerResult service_filter(DBusConnection *connection,
 		/* Only auto remove if it is a bus name watch */
 		if (data->argument[0] == ':' &&
 				(cb->conn_func == NULL || cb->disc_func == NULL)) {
-			if (filter_data_remove_callback(data, cb))
-				break;
-
+			filter_data_remove_callback(data, cb);
 			continue;
 		}

@@ -591,6 +586,7 @@ static gboolean update_service(void *user_data)
 	struct filter_callback *cb = data->callback;
 	DBusConnection *conn;

+	update_name_cache(data->name, data->owner);
 	conn = dbus_connection_ref(data->conn);
 	service_data_free(data);

@@ -699,8 +695,7 @@ guint g_dbus_add_service_watch(DBusConnection *connection, const char *name,
 	if (name == NULL)
 		return 0;

-	data = filter_data_get(connection, service_filter,
-				DBUS_SERVICE_DBUS, DBUS_PATH_DBUS,
+	data = filter_data_get(connection, service_filter, NULL, NULL,
 				DBUS_INTERFACE_DBUS, "NameOwnerChanged",
 				name);
 	if (data == NULL)
--- a/ofono/gril/gril.c
+++ b/ofono/gril/gril.c
@@ -85,7 +85,6 @@ struct ril_s {
 	guint next_cmd_id;			/* Next command id */
 	guint next_notify_id;			/* Next notify id */
 	guint next_gid;				/* Next group id */
-	int sk;					/* Socket */
 	GRilIO *io;				/* GRil IO */
 	GQueue *command_queue;			/* Command queue */
 	GQueue *out_queue;			/* Commands sent/been sent */
@@ -787,7 +786,6 @@ static void ril_unref(struct ril_s *ril)
 		g_ril_io_unref(ril->io);
 		ril->io = NULL;
 		ril_cleanup(ril);
-		close(ril->sk);
 	}

 	if (ril->in_read_handler)
@@ -812,6 +810,7 @@ static struct ril_s *create_ril()
 {
 	struct ril_s *ril;
 	struct sockaddr_un addr;
+	int sk;
 	GIOChannel *io;
 	GKeyFile *keyfile;
 	char **subscriptions = NULL;
@@ -832,10 +831,10 @@ static struct ril_s *create_ril()
 	ril->trace = FALSE;
 	ril->connected = FALSE;

-	ril->sk = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (ril->sk < 0) {
-		ofono_error("%s: can't create unix socket: %s (%d)\n",
-				__func__, strerror(errno), errno);
+	sk = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (sk < 0) {
+		ofono_error("create_ril: can't create unix socket: %s (%d)\n",
+				strerror(errno), errno);
 		goto error;
 	}

@@ -843,16 +842,16 @@ static struct ril_s *create_ril()
 	addr.sun_family = AF_UNIX;
 	strncpy(addr.sun_path, RILD_CMD_SOCKET, sizeof(addr.sun_path) - 1);

-	if (connect(ril->sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-		ofono_error("%s: can't connect to RILD: %s (%d)\n",
-				__func__, strerror(errno), errno);
+	if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+		ofono_error("create_ril: can't connect to RILD: %s (%d)\n",
+				strerror(errno), errno);
 		goto error;
 	}

-	io = g_io_channel_unix_new(ril->sk);
+	io = g_io_channel_unix_new(sk);
 	if (io == NULL) {
-		ofono_error("%s: can't connect to RILD: %s (%d)\n",
-				__func__, strerror(errno), errno);
+		ofono_error("create_ril: can't connect to RILD: %s (%d)\n",
+				strerror(errno), errno);
 		return NULL;
 	}

@@ -861,7 +860,7 @@ static struct ril_s *create_ril()

 	ril->io = g_ril_io_new(io);
 	if (ril->io == NULL) {
-		ofono_error("%s: can't create ril->io", __func__);
+		ofono_error("create_ril: can't create ril->io");
 		goto error;
 	}

@@ -869,13 +868,13 @@ static struct ril_s *create_ril()

 	ril->command_queue = g_queue_new();
 	if (ril->command_queue == NULL) {
-		ofono_error("%s: Couldn't create command_queue.", __func__);
+		ofono_error("create_ril: Couldn't create command_queue.");
 		goto error;
 	}

 	ril->out_queue = g_queue_new();
 	if (ril->out_queue == NULL) {
-		ofono_error("%s: Couldn't create out_queue.", __func__);
+		ofono_error("create_ril: Couldn't create out_queue.");
 		goto error;
 	}

@@ -905,6 +904,9 @@ static struct ril_s *create_ril()
 		g_strfreev(subscriptions);
 	}

+	current_passwd = g_try_malloc(16);
+	if (current_passwd)
+		g_stpcpy(current_passwd, defaultpasswd);
 	current_online_state = RIL_OFFLINE;

 	return ril;
--- a/ofono/gril/gril.h
+++ b/ofono/gril/gril.h
@@ -138,6 +138,7 @@ guint g_ril_register(GRil *ril, const int req,
 gboolean g_ril_unregister(GRil *ril, guint id);
 gboolean g_ril_unregister_all(GRil *ril);

+gchar *current_passwd;
 guint current_online_state;

 #ifdef __cplusplus
--- a/ofono/gril/grilio.c
+++ b/ofono/gril/grilio.c
@@ -73,7 +73,6 @@ static void read_watcher_destroy_notify(gpointer user_data)
 	io->read_handler = NULL;
 	io->read_data = NULL;

-	g_io_channel_unref(io->channel);
 	io->channel = NULL;

 	if (io->destroyed)
--- a/ofono/gril/grilreply.c
+++ b/ofono/gril/grilreply.c
@@ -159,8 +159,19 @@ struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,

 	}

+	/* TODO:
+	 * RILD can return multiple addresses; oFono only supports
+	 * setting a single IPv4 address.  At this time, we only
+	 * use the first address.  It's possible that a RIL may
+	 * just specify the end-points of the point-to-point
+	 * connection, in which case this code will need to
+	 * changed to handle such a device.
+	 *
+	 * For now split into a maximum of three, and only use
+	 * the first address for the remaining operations.
+	 */
 	if (raw_ip_addrs)
-		reply->ip_addrs = g_strsplit(raw_ip_addrs, " ", -1);
+		reply->ip_addrs = g_strsplit(raw_ip_addrs, " ", 3);
 	else
 		reply->ip_addrs = NULL;

@@ -180,7 +191,7 @@ struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
 	 * setting a single IPv4 gateway.
 	 */
 	if (raw_gws)
-		reply->gateways = g_strsplit(raw_gws, " ", -1);
+		reply->gateways = g_strsplit(raw_gws, " ", 3);
 	else
 		reply->gateways = NULL;

@@ -192,7 +203,7 @@ struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,

 	/* Split DNS addresses */
 	if (dnses)
-		reply->dns_addresses = g_strsplit(dnses, " ", -1);
+		reply->dns_addresses = g_strsplit(dnses, " ", 3);
 	else
 		reply->dns_addresses = NULL;

--- a/ofono/gril/grilunsol.c
+++ b/ofono/gril/grilunsol.c
@@ -77,58 +77,6 @@ void g_ril_unsol_free_data_call_list(struct unsol_data_call_list *unsol)
 	}
 }

-gboolean g_ril_unsol_cmp_dcl(struct unsol_data_call_list *current,
-				struct unsol_data_call_list *old,
-				gint cid)
-{
-	GSList *nl,*ol;
-	struct data_call *new_call, *old_call;
-
-	new_call = old_call = NULL;
-	gboolean no_cid = TRUE;
-
-
-	if (!current || !old)
-		return FALSE;
-
-	if (current->num != old->num)
-		return FALSE;
-
-	for (nl = current->call_list; nl; nl = nl->next) {
-		new_call = (struct data_call *) nl->data;
-
-		if (new_call->cid != cid)
-			continue;
-
-		for (ol = old->call_list; ol; ol = ol->next) {
-			old_call = (struct data_call *) ol->data; 
-			if(new_call->cid == old_call->cid) {
-				no_cid = FALSE;
-				break;
-			}
-		}
-		if (no_cid)
-			return FALSE;
-
-		if (new_call->active != old_call->active)
-			return FALSE;
-		if (g_strcmp0(new_call->type,old_call->type))
-			return FALSE;
-		if (g_strcmp0(new_call->ifname,old_call->ifname))
-			return FALSE;
-		if (g_strcmp0(new_call->addresses,old_call->addresses))
-			return FALSE;
-		if (g_strcmp0(new_call->dnses,old_call->dnses))
-			return FALSE;
-		if (g_strcmp0(new_call->gateways,old_call->gateways))
-			return FALSE;
-	}
-	if (no_cid)
-		return FALSE;
-
-	return TRUE;
-}
-
 struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
 					struct ril_msg *message,
 					struct ofono_error *error)
--- a/ofono/gril/grilunsol.h
+++ b/ofono/gril/grilunsol.h
@@ -51,9 +51,6 @@ struct data_call {

 void g_ril_unsol_free_data_call_list(struct unsol_data_call_list *unsol);

-gboolean g_ril_unsol_cmp_dcl(struct unsol_data_call_list *current,
-				struct unsol_data_call_list *old, gint cid);
-
 struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
 					struct ril_msg *message,
 					struct ofono_error *error);
--- a/ofono/include/emulator.h
+++ b/ofono/include/emulator.h
@@ -104,9 +104,6 @@ enum ofono_emulator_request_type ofono_emulator_request_get_type(

 void ofono_emulator_set_indicator(struct ofono_emulator *em,
 					const char *name, int value);
-void ofono_emulator_set_hf_indicator_active(struct ofono_emulator *em,
-						int indicator,
-						ofono_bool_t active);

 #ifdef __cplusplus
 }
--- a/ofono/include/gprs-context.h
+++ b/ofono/include/gprs-context.h
@@ -48,11 +48,6 @@ enum ofono_gprs_context_type {
 	OFONO_GPRS_CONTEXT_TYPE_IMS,
 };

-enum ofono_gprs_auth_method {
-	OFONO_GPRS_AUTH_METHOD_CHAP = 0,
-	OFONO_GPRS_AUTH_METHOD_PAP,
-};
-
 struct ofono_gprs_primary_context {
 	unsigned int cid;
 	int direction;
@@ -60,7 +55,6 @@ struct ofono_gprs_primary_context {
 	char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
 	char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
 	enum ofono_gprs_proto proto;
-	enum ofono_gprs_auth_method auth_method;
 };

 typedef void (*ofono_gprs_context_cb_t)(const struct ofono_error *error,
@@ -123,10 +117,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_signal_change(struct ofono_gprs_context *gc,
-							unsigned int cid);
-
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/gprs-provision.h
+++ b/ofono/include/gprs-provision.h
@@ -37,7 +37,6 @@ struct ofono_gprs_provision_data {
 	char *apn;
 	char *username;
 	char *password;
-	enum ofono_gprs_auth_method auth_method;
 	char *message_proxy;
 	char *message_center;
 };
--- a/ofono/include/gprs.h
+++ b/ofono/include/gprs.h
@@ -78,8 +78,6 @@ void ofono_gprs_set_cid_range(struct ofono_gprs *gprs,
 void ofono_gprs_add_context(struct ofono_gprs *gprs,
 				struct ofono_gprs_context *gc);

-struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs);
-
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/handsfree.h
+++ b/ofono/include/handsfree.h
@@ -36,18 +36,12 @@ typedef void (*ofono_handsfree_cb_t)(const struct ofono_error *error,
 typedef void (*ofono_handsfree_phone_cb_t)(const struct ofono_error *error,
 					const struct ofono_phone_number *number,
 					void *data);
-typedef void (*ofono_handsfree_cnum_query_cb_t)(const struct ofono_error *error,
-				int total,
-				const struct ofono_phone_number *numbers,
-				void *data);

 struct ofono_handsfree_driver {
 	const char *name;
 	int (*probe)(struct ofono_handsfree *hf, unsigned int vendor,
 			void *data);
 	void (*remove)(struct ofono_handsfree *hf);
-	void (*cnum_query)(struct ofono_handsfree *hf,
-				ofono_handsfree_cnum_query_cb_t cb, void *data);
 	void (*request_phone_number) (struct ofono_handsfree *hf,
 					ofono_handsfree_phone_cb_t cb,
 					void *data);
@@ -56,27 +50,15 @@ struct ofono_handsfree_driver {
 					ofono_handsfree_cb_t cb, void *data);
 	void (*disable_nrec)(struct ofono_handsfree *hf,
 					ofono_handsfree_cb_t cb, void *data);
-	void (*hf_indicator)(struct ofono_handsfree *hf,
-				unsigned short indicator, unsigned int value,
-				ofono_handsfree_cb_t cb, void *data);
 };

 void ofono_handsfree_set_ag_features(struct ofono_handsfree *hf,
 					unsigned int ag_features);
-void ofono_handsfree_set_ag_chld_features(struct ofono_handsfree *hf,
-					unsigned int ag_chld_features);
 void ofono_handsfree_set_inband_ringing(struct ofono_handsfree *hf,
 						ofono_bool_t enabled);
 void ofono_handsfree_voice_recognition_notify(struct ofono_handsfree *hf,
 						ofono_bool_t enabled);

-void ofono_handsfree_set_hf_indicators(struct ofono_handsfree *hf,
-					const unsigned short *indicators,
-					unsigned int num);
-void ofono_handsfree_hf_indicator_active_notify(struct ofono_handsfree *hf,
-						unsigned int indicator,
-						ofono_bool_t active);
-
 void ofono_handsfree_battchg_notify(struct ofono_handsfree *hf,
 					unsigned char level);

--- a/ofono/include/radio-settings.h
+++ b/ofono/include/radio-settings.h
@@ -29,10 +29,10 @@ extern "C" {
 #include <ofono/types.h>

 enum ofono_radio_access_mode {
-	OFONO_RADIO_ACCESS_MODE_ANY	= 0x0,
-	OFONO_RADIO_ACCESS_MODE_GSM	= 0x1,
-	OFONO_RADIO_ACCESS_MODE_UMTS	= 0x2,
-	OFONO_RADIO_ACCESS_MODE_LTE	= 0x4,
+	OFONO_RADIO_ACCESS_MODE_ANY	= 0,
+	OFONO_RADIO_ACCESS_MODE_GSM	= 1,
+	OFONO_RADIO_ACCESS_MODE_UMTS	= 2,
+	OFONO_RADIO_ACCESS_MODE_LTE	= 3,
 };

 enum ofono_radio_band_gsm {
@@ -80,11 +80,6 @@ typedef void (*ofono_radio_settings_fast_dormancy_query_cb_t)(
 						ofono_bool_t enable,
 						void *data);

-typedef void (*ofono_radio_settings_available_rats_query_cb_t)(
-						const struct ofono_error *error,
-						unsigned int available_rats,
-						void *data);
-
 struct ofono_radio_settings_driver {
 	const char *name;
 	int (*probe)(struct ofono_radio_settings *rs, unsigned int vendor,
@@ -112,9 +107,6 @@ struct ofono_radio_settings_driver {
 				ofono_bool_t enable,
 				ofono_radio_settings_fast_dormancy_set_cb_t,
 				void *data);
-	void (*query_available_rats)(struct ofono_radio_settings *rs,
-			ofono_radio_settings_available_rats_query_cb_t cb,
-			void *data);
 };

 int ofono_radio_settings_driver_register(
--- a/ofono/plugins/emulator_fuzz.c
+++ b/ofono/plugins/emulator_fuzz.c
@@ -1,126 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2014  Intel Corporation. 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.
- *
- *  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
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdint.h>
-#include <sys/socket.h>
-#include <glib.h>
-#include <ofono.h>
-#include <gdbus.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/emulator.h>
-
-#include "hfp.h"
-
-#define EMULATOR_FUZZ_INTERFACE "org.ofono.test.EmulatorFuzz"
-#define EMULATOR_FUZZ_PATH   "/test"
-
-static void emulator_set_indicator(struct ofono_atom *atom, void *data)
-{
-	struct ofono_emulator *em = __ofono_atom_get_data(atom);
-	ofono_bool_t active = GPOINTER_TO_INT(data);
-
-	ofono_emulator_set_hf_indicator_active(em,
-				HFP_HF_INDICATOR_ENHANCED_SAFETY, active);
-}
-
-static void modem_set_indicators(struct ofono_modem *modem, void *user)
-{
-	__ofono_modem_foreach_registered_atom(modem,
-						OFONO_ATOM_TYPE_EMULATOR_HFP,
-						emulator_set_indicator,
-						user);
-}
-
-static DBusMessage *set_indicator_active(DBusConnection *conn,
-					DBusMessage *msg, void *user_data)
-{
-	const char *indicator;
-	dbus_bool_t active;
-
-	DBG("");
-
-	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &indicator,
-						DBUS_TYPE_BOOLEAN, &active,
-						DBUS_TYPE_INVALID) == FALSE)
-		goto invalid;
-
-	DBG("%s,%d", indicator, active);
-
-	if (strcmp(indicator, "DistractedDrivingReduction"))
-		goto invalid;
-
-	__ofono_modem_foreach(modem_set_indicators, GINT_TO_POINTER(active));
-
-	return dbus_message_new_method_return(msg);
-
-invalid:
-	return g_dbus_create_error(msg, "org.ofono.test.Error",
-					"Invalid arguments in method call");
-}
-
-static const GDBusMethodTable emulator_fuzz_methods[] = {
-	{ GDBUS_ASYNC_METHOD("SetIndicatorActive",
-		GDBUS_ARGS({ "indicator", "s" }, { "active", "b" }),
-		NULL, set_indicator_active) },
-	{ },
-};
-
-static int emulator_fuzz_init(void)
-{
-	DBusConnection *conn = ofono_dbus_get_connection();
-
-	DBG("");
-
-	if (!g_dbus_register_interface(conn, EMULATOR_FUZZ_PATH,
-					EMULATOR_FUZZ_INTERFACE,
-					emulator_fuzz_methods, NULL,
-					NULL, NULL, NULL)) {
-		ofono_error("Register Profile interface failed: %s",
-						EMULATOR_FUZZ_PATH);
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static void emulator_fuzz_exit(void)
-{
-	DBusConnection *conn = ofono_dbus_get_connection();
-
-	DBG("");
-
-	g_dbus_unregister_interface(conn, EMULATOR_FUZZ_PATH,
-						EMULATOR_FUZZ_INTERFACE);
-}
-
-OFONO_PLUGIN_DEFINE(emulator_fuzz, "Emulator Fuzz",
-				VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT,
-				emulator_fuzz_init, emulator_fuzz_exit)
--- a/ofono/plugins/he910.c
+++ b/ofono/plugins/he910.c
@@ -2,7 +2,7 @@
 *
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2008-2014  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2008-2011  Intel Corporation. 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
@@ -46,7 +46,6 @@
 #include <ofono/call-settings.h>
 #include <ofono/devinfo.h>
 #include <ofono/message-waiting.h>
-#include <ofono/location-reporting.h>
 #include <ofono/netreg.h>
 #include <ofono/phonebook.h>
 #include <ofono/sim.h>
@@ -60,7 +59,6 @@
 #include <drivers/atmodem/vendor.h>

 static const char *none_prefix[] = { NULL };
-static const char *qss_prefix[] = { "#QSS:", NULL };

 struct he910_data {
 	GAtChat *chat;		/* AT chat */
@@ -103,7 +101,7 @@ static GAtChat *open_device(struct ofono_modem *modem,
 	if (channel == NULL)
 		return NULL;

-	syntax = g_at_syntax_new_gsm_permissive();
+	syntax = g_at_syntax_new_gsmv1();
 	chat = g_at_chat_new(channel, syntax);
 	g_at_syntax_unref(syntax);
 	g_io_channel_unref(channel);
@@ -169,31 +167,6 @@ static void he910_qss_notify(GAtResult *result, gpointer user_data)
 	switch_sim_state_status(modem, status);
 }

-static void qss_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	int status, mode;
-	GAtResultIter iter;
-
-	DBG("%p", modem);
-
-	if (!ok)
-		return;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "#QSS:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &mode))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &status))
-		return;
-
-	switch_sim_state_status(modem, status);
-}
-
 static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -231,15 +204,6 @@ static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	g_at_chat_send(data->chat, "AT#AUTOATT=0", none_prefix,
 				NULL, NULL, NULL);

-	/* Follow sim state */
-	g_at_chat_register(data->chat, "#QSS:", he910_qss_notify,
-				FALSE, modem, NULL);
-
-	/* Enable sim state notification */
-	g_at_chat_send(data->chat, "AT#QSS=2", none_prefix, NULL, NULL, NULL);
-
-	g_at_chat_send(data->chat, "AT#QSS?", qss_prefix,
-			qss_query_cb, modem, NULL);
 }

 static int he910_enable(struct ofono_modem *modem)
@@ -268,6 +232,13 @@ static int he910_enable(struct ofono_modem *modem)
 	g_at_chat_send(data->chat, "ATE0 +CMEE=1", none_prefix,
 				NULL, NULL, NULL);

+	/* Follow sim state */
+	g_at_chat_register(data->chat, "#QSS:", he910_qss_notify,
+				FALSE, modem, NULL);
+
+	/* Enable sim state notification */
+	g_at_chat_send(data->chat, "AT#QSS=2", none_prefix, NULL, NULL, NULL);
+
 	/* Set phone functionality */
 	g_at_chat_send(data->chat, "AT+CFUN=1", none_prefix,
 				cfun_enable_cb, modem, NULL);
@@ -319,7 +290,6 @@ static void he910_pre_sim(struct ofono_modem *modem)
 	ofono_devinfo_create(modem, 0, "atmodem", data->chat);
 	data->sim = ofono_sim_create(modem, OFONO_VENDOR_TELIT, "atmodem",
 					data->chat);
-	ofono_location_reporting_create(modem, 0, "telitmodem", data->chat);
 }

 static void he910_post_online(struct ofono_modem *modem)
--- a/ofono/plugins/hfp_ag_bluez5.c
+++ b/ofono/plugins/hfp_ag_bluez5.c
@@ -232,7 +232,7 @@ static void sim_state_watch(enum ofono_sim_state new_state, void *data)
 	if (modems->next != NULL)
 		return;

-	bt_register_profile(conn, HFP_AG_UUID, HFP_VERSION_1_7, "hfp_ag",
+	bt_register_profile(conn, HFP_AG_UUID, HFP_VERSION_1_5, "hfp_ag",
 					HFP_AG_EXT_PROFILE_PATH, NULL, 0);
 }

@@ -299,7 +299,7 @@ static void voicecall_watch(struct ofono_atom *atom,
 	if (modems->next != NULL)
 		return;

-	bt_register_profile(conn, HFP_AG_UUID, HFP_VERSION_1_7, "hfp_ag",
+	bt_register_profile(conn, HFP_AG_UUID, HFP_VERSION_1_5, "hfp_ag",
 					HFP_AG_EXT_PROFILE_PATH, NULL, 0);
 }

--- a/ofono/plugins/hfp_hf_bluez5.c
+++ b/ofono/plugins/hfp_hf_bluez5.c
@@ -49,7 +49,6 @@
 #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>
@@ -72,7 +71,6 @@ struct hfp {
 	struct ofono_handsfree_card *card;
 };

-static const char *none_prefix[] = { NULL };
 static GDBusClient *bluez = NULL;

 static void hfp_debug(const char *str, void *user_data)
@@ -349,7 +347,7 @@ static void bcs_notify(GAtResult *result, gpointer user_data)
 	sprintf(str, "AT+BCS=%d", value);

 done:
-	g_at_chat_send(info->chat, str, none_prefix, NULL, NULL, NULL);
+	g_at_chat_send(info->chat, str, NULL, NULL, NULL, NULL);
 }

 static int hfp16_card_probe(struct ofono_handsfree_card *card,
@@ -644,7 +642,7 @@ static void connect_handler(DBusConnection *conn, void *user_data)

 	DBG("Registering External Profile handler ...");

-	bt_register_profile(conn, HFP_HS_UUID, HFP_VERSION_1_7, "hfp_hf",
+	bt_register_profile(conn, HFP_HS_UUID, HFP_VERSION_1_6, "hfp_hf",
 					HFP_EXT_PROFILE_PATH, NULL, features);
 }

@@ -764,8 +762,6 @@ 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,
@@ -821,8 +817,6 @@ 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
@@ -132,37 +132,6 @@ static const GMarkupParser text_parser = {
 	NULL,
 };

-static void authentication_start(GMarkupParseContext *context,
-			const gchar **attribute_names,
-			const gchar **attribute_values,
-			enum ofono_gprs_auth_method *auth_method,
-			GError **error)
-{
-	const char *text = NULL;
-	int i;
-
-	for (i = 0; attribute_names[i]; i++)
-		if (g_str_equal(attribute_names[i], "method") == TRUE)
-			text = attribute_values[i];
-
-	if (text == NULL) {
-		mbpi_g_set_error(context, error, G_MARKUP_ERROR,
-					G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-					"Missing attribute: method");
-		return;
-	}
-
-	if (strcmp(text, "chap") == 0)
-		*auth_method = OFONO_GPRS_AUTH_METHOD_CHAP;
-	else if (strcmp(text, "pap") == 0)
-		*auth_method = OFONO_GPRS_AUTH_METHOD_PAP;
-	else
-		mbpi_g_set_error(context, error, G_MARKUP_ERROR,
-					G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
-					"Unknown authentication method: %s",
-					text);
-}
-
 static void usage_start(GMarkupParseContext *context,
 			const gchar **attribute_names,
 			const gchar **attribute_values,
@@ -209,9 +178,6 @@ static void apn_start(GMarkupParseContext *context, const gchar *element_name,
 	else if (g_str_equal(element_name, "password"))
 		g_markup_parse_context_push(context, &text_parser,
 						&apn->password);
-	else if (g_str_equal(element_name, "authentication"))
-		authentication_start(context, attribute_names,
-				attribute_values, &apn->auth_method, error);
 	else if (g_str_equal(element_name, "mmsc"))
 		g_markup_parse_context_push(context, &text_parser,
 						&apn->message_center);
@@ -332,7 +298,6 @@ static void apn_handler(GMarkupParseContext *context, struct gsm_data *gsm,
 	ap->apn = g_strdup(apn);
 	ap->type = OFONO_GPRS_CONTEXT_TYPE_INTERNET;
 	ap->proto = OFONO_GPRS_PROTO_IP;
-	ap->auth_method = OFONO_GPRS_AUTH_METHOD_CHAP;

 	g_markup_parse_context_push(context, &apn_parser, ap);
 }
--- a/ofono/plugins/phonesim.c
+++ b/ofono/plugins/phonesim.c
@@ -351,65 +351,6 @@ static void phonesim_ctm_set(struct ofono_ctm *ctm, ofono_bool_t enable,
 	g_free(cbd);
 }

-static gboolean phonesim_radio_settings_register(gpointer user)
-{
-	struct ofono_radio_settings *rs = user;
-
-	ofono_radio_settings_register(rs);
-
-	return FALSE;
-}
-
-static int phonesim_radio_settings_probe(struct ofono_radio_settings *rs,
-					unsigned int vendor, void *data)
-{
-	GAtChat *chat;
-
-	DBG("");
-
-	chat = g_at_chat_clone(data);
-
-	ofono_radio_settings_set_data(rs, chat);
-	g_idle_add(phonesim_radio_settings_register, rs);
-
-	return 0;
-}
-
-static void phonesim_radio_settings_remove(struct ofono_radio_settings *rs)
-{
-	GAtChat *chat = ofono_radio_settings_get_data(rs);
-
-	DBG("");
-
-	ofono_radio_settings_set_data(rs, NULL);
-
-	g_at_chat_unref(chat);
-}
-
-static void phonesim_query_rat_mode(struct ofono_radio_settings *rs,
-                                ofono_radio_settings_rat_mode_query_cb_t cb,
-				void *data)
-{
-	DBG("");
-
-	CALLBACK_WITH_SUCCESS(cb, OFONO_RADIO_ACCESS_MODE_ANY, data);
-}
-
-static void phonesim_query_available_rats(struct ofono_radio_settings *rs,
-			ofono_radio_settings_available_rats_query_cb_t cb,
-			void *data)
-{
-	uint32_t techs = 0;
-
-	DBG("");
-
-	techs |= OFONO_RADIO_ACCESS_MODE_GSM;
-	techs |= OFONO_RADIO_ACCESS_MODE_UMTS;
-	techs |= OFONO_RADIO_ACCESS_MODE_LTE;
-
-	CALLBACK_WITH_SUCCESS(cb, techs, data);
-}
-
 static struct ofono_gprs_context_driver context_driver = {
 	.name			= "phonesim",
 	.probe			= phonesim_context_probe,
@@ -418,14 +359,6 @@ static struct ofono_gprs_context_driver context_driver = {
 	.deactivate_primary	= phonesim_deactivate_primary,
 };

-static struct ofono_radio_settings_driver radio_settings_driver = {
-	.name			= "phonesim",
-	.probe			= phonesim_radio_settings_probe,
-	.remove			= phonesim_radio_settings_remove,
-	.query_rat_mode		= phonesim_query_rat_mode,
-	.query_available_rats	= phonesim_query_available_rats,
-};
-
 static struct ofono_ctm_driver ctm_driver = {
 	.name			= "phonesim",
 	.probe			= phonesim_ctm_probe,
@@ -858,8 +791,6 @@ static void phonesim_post_sim(struct ofono_modem *modem)

 	if (!data->calypso)
 		ofono_sms_create(modem, 0, "atmodem", data->chat);
-
-	ofono_radio_settings_create(modem, 0, "phonesim", data->chat);
 }

 static void phonesim_post_online(struct ofono_modem *modem)
@@ -1140,7 +1071,6 @@ done:
 static int phonesim_init(void)
 {
 	int err;
-	char *conf_override = getenv("OFONO_PHONESIM_CONFIG");

 	err = ofono_modem_driver_register(&phonesim_driver);
 	if (err < 0)
@@ -1150,12 +1080,8 @@ static int phonesim_init(void)

 	ofono_gprs_context_driver_register(&context_driver);
 	ofono_ctm_driver_register(&ctm_driver);
-	ofono_radio_settings_driver_register(&radio_settings_driver);

-	if (conf_override)
-		parse_config(conf_override);
-	else
-		parse_config(CONFIGDIR "/phonesim.conf");
+	parse_config(CONFIGDIR "/phonesim.conf");

 	return 0;
 }
@@ -1173,7 +1099,6 @@ static void phonesim_exit(void)
 	g_slist_free(modem_list);
 	modem_list = NULL;

-	ofono_radio_settings_driver_unregister(&radio_settings_driver);
 	ofono_ctm_driver_unregister(&ctm_driver);

 	ofono_gprs_context_driver_unregister(&context_driver);
--- a/ofono/plugins/quectel.c
+++ b/ofono/plugins/quectel.c
@@ -1,376 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2014  Philip Paeps. 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.
- *
- *  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
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <stdlib.h>
-
-#include <glib.h>
-#include <gatchat.h>
-#include <gattty.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-#include <ofono/modem.h>
-#include <ofono/devinfo.h>
-#include <ofono/netreg.h>
-#include <ofono/sim.h>
-#include <ofono/gprs.h>
-#include <ofono/gprs-context.h>
-#include <ofono/log.h>
-
-#include <drivers/atmodem/atutil.h>
-#include <drivers/atmodem/vendor.h>
-
-static const char *cfun_prefix[] = { "+CFUN:", NULL };
-static const char *cpin_prefix[] = { "+CPIN:", NULL };
-static const char *none_prefix[] = { NULL };
-
-struct quectel_data {
-	GAtChat *modem;
-	GAtChat *aux;
-	guint cpin_ready;
-	gboolean have_sim;
-};
-
-static void quectel_debug(const char *str, void *user_data)
-{
-	const char *prefix = user_data;
-
-	ofono_info("%s%s", prefix, str);
-}
-
-static int quectel_probe(struct ofono_modem *modem)
-{
-	struct quectel_data *data;
-
-	DBG("%p", modem);
-
-	data = g_try_new0(struct quectel_data, 1);
-	if (data == NULL)
-		return -ENOMEM;
-
-	ofono_modem_set_data(modem, data);
-
-	return 0;
-}
-
-static void quectel_remove(struct ofono_modem *modem)
-{
-	struct quectel_data *data = ofono_modem_get_data(modem);
-
-	DBG("%p", modem);
-
-	if (data->cpin_ready != 0)
-		g_at_chat_unregister(data->aux, data->cpin_ready);
-
-	ofono_modem_set_data(modem, NULL);
-	g_at_chat_unref(data->aux);
-	g_at_chat_unref(data->modem);
-	g_free(data);
-}
-
-static GAtChat *open_device(struct ofono_modem *modem,
-				const char *key, char *debug)
-{
-	const char *device;
-	GAtSyntax *syntax;
-	GIOChannel *channel;
-	GAtChat *chat;
-
-	device = ofono_modem_get_string(modem, key);
-	if (device == NULL)
-		return NULL;
-
-	DBG("%s %s", key, device);
-
-	channel = g_at_tty_open(device, NULL);
-	if (channel == NULL)
-		return NULL;
-
-	syntax = g_at_syntax_new_gsm_permissive();
-	chat = g_at_chat_new(channel, syntax);
-	g_at_syntax_unref(syntax);
-
-	g_io_channel_unref(channel);
-
-	if (chat == NULL)
-		return NULL;
-
-	if (getenv("OFONO_AT_DEBUG"))
-		g_at_chat_set_debug(chat, quectel_debug, debug);
-
-	return chat;
-}
-
-static void cpin_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct quectel_data *data = ofono_modem_get_data(modem);
-	const char *sim_inserted;
-	GAtResultIter iter;
-
-	DBG("%p", modem);
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CPIN:"))
-		return;
-
-	g_at_result_iter_next_unquoted_string(&iter, &sim_inserted);
-
-	if (g_strcmp0(sim_inserted, "NOT INSERTED") != 0)
-		data->have_sim = TRUE;
-
-	ofono_modem_set_powered(modem, TRUE);
-
-	/* Turn off the radio. */
-	g_at_chat_send(data->aux, "AT+CFUN=4", none_prefix, NULL, NULL, NULL);
-
-	g_at_chat_unregister(data->aux, data->cpin_ready);
-	data->cpin_ready = 0;
-}
-
-static void cpin_query(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	DBG("ok %d", ok);
-
-	if (ok)
-		cpin_notify(result, user_data);
-}
-
-static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct quectel_data *data = ofono_modem_get_data(modem);
-
-	DBG("ok %d", ok);
-
-	if (!ok) {
-		g_at_chat_unref(data->aux);
-		data->aux = NULL;
-		g_at_chat_unref(data->modem);
-		data->modem = NULL;
-		ofono_modem_set_powered(modem, FALSE);
-		return;
-	}
-
-	data->cpin_ready = g_at_chat_register(data->aux, "+CPIN", cpin_notify,
-						FALSE, modem, NULL);
-	g_at_chat_send(data->aux, "AT+CPIN?", cpin_prefix, cpin_query,
-						modem, NULL);
-}
-
-static void cfun_query(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct quectel_data *data = ofono_modem_get_data(modem);
-	GAtResultIter iter;
-	int status;
-
-	DBG("ok %d", ok);
-
-	if (!ok)
-		return;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (g_at_result_iter_next(&iter, "+CFUN:") == FALSE)
-		return;
-
-	g_at_result_iter_next_number(&iter, &status);
-
-	/*
-	 * The modem firmware powers up in CFUN=1 but will respond to AT+CFUN=4
-	 * with ERROR until some amount of time (which varies with temperature)
-	 * passes.  Empirical evidence suggests that the firmware will report an
-	 * unsolicited +CPIN: notification when it is ready to be useful.
-	 *
-	 * Work around this feature by only transitioning to CFUN=4 after we've
-	 * received an unsolicited +CPIN: notification.
-	 */
-
-	if (status != 1) {
-		g_at_chat_send(data->aux, "AT+CFUN=4", none_prefix,
-					cfun_enable, modem, NULL);
-		return;
-	}
-
-	cfun_enable(TRUE, NULL, modem);
-}
-
-static int quectel_enable(struct ofono_modem *modem)
-{
-	struct quectel_data *data = ofono_modem_get_data(modem);
-
-	DBG("%p", modem);
-
-	data->modem = open_device(modem, "Modem", "Modem: ");
-	if (data->modem == NULL)
-		return -EINVAL;
-
-	data->aux = open_device(modem, "Aux", "Aux: ");
-	if (data->aux == NULL) {
-		g_at_chat_unref(data->modem);
-		data->modem = NULL;
-		return -EIO;
-	}
-
-	g_at_chat_set_slave(data->modem, data->aux);
-
-	g_at_chat_send(data->modem, "ATE0 &C0 +CMEE=1", none_prefix,
-					NULL, NULL, NULL);
-	g_at_chat_send(data->aux, "ATE0 &C0 +CMEE=1", none_prefix,
-					NULL, NULL, NULL);
-
-	g_at_chat_send(data->aux, "AT+CFUN?", cfun_prefix,
-					cfun_query, modem, NULL);
-
-	return -EINPROGRESS;
-}
-
-static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct quectel_data *data = ofono_modem_get_data(modem);
-
-	DBG("");
-
-	g_at_chat_unref(data->aux);
-	data->aux = NULL;
-
-	if (ok)
-		ofono_modem_set_powered(modem, FALSE);
-}
-
-static int quectel_disable(struct ofono_modem *modem)
-{
-	struct quectel_data *data = ofono_modem_get_data(modem);
-
-	DBG("%p", modem);
-
-	g_at_chat_cancel_all(data->modem);
-	g_at_chat_unregister_all(data->modem);
-
-	g_at_chat_unref(data->modem);
-	data->modem = NULL;
-
-	g_at_chat_cancel_all(data->aux);
-	g_at_chat_unregister_all(data->aux);
-
-	g_at_chat_send(data->aux, "AT+CFUN=0", cfun_prefix,
-					cfun_disable, modem, NULL);
-
-	return -EINPROGRESS;
-}
-
-static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_modem_online_cb_t cb = cbd->cb;
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-	cb(&error, cbd->data);
-}
-
-static void quectel_set_online(struct ofono_modem *modem, ofono_bool_t online,
-				ofono_modem_online_cb_t cb, void *user_data)
-{
-	struct quectel_data *data = ofono_modem_get_data(modem);
-	struct cb_data *cbd = cb_data_new(cb, user_data);
-	char const *command = online ? "AT+CFUN=1" : "AT+CFUN=4";
-
-	DBG("modem %p %s", modem, online ? "online" : "offline");
-
-	if (g_at_chat_send(data->aux, command, cfun_prefix, set_online_cb,
-					cbd, g_free) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, cbd->data);
-
-	g_free(cbd);
-}
-
-static void quectel_pre_sim(struct ofono_modem *modem)
-{
-	struct quectel_data *data = ofono_modem_get_data(modem);
-	struct ofono_sim *sim;
-
-	DBG("%p", modem);
-
-	ofono_devinfo_create(modem, 0, "atmodem", data->aux);
-	sim = ofono_sim_create(modem, OFONO_VENDOR_QUECTEL, "atmodem",
-					data->aux);
-
-	if (sim && data->have_sim == TRUE)
-		ofono_sim_inserted_notify(sim, TRUE);
-}
-
-static void quectel_post_sim(struct ofono_modem *modem)
-{
-	struct quectel_data *data = ofono_modem_get_data(modem);
-	struct ofono_gprs *gprs;
-	struct ofono_gprs_context *gc;
-
-	DBG("%p", modem);
-
-	gprs = ofono_gprs_create(modem, 0, "atmodem", data->aux);
-	gc = ofono_gprs_context_create(modem, 0, "atmodem", data->modem);
-
-	if (gprs && gc)
-		ofono_gprs_add_context(gprs, gc);
-}
-
-static void quectel_post_online(struct ofono_modem *modem)
-{
-	struct quectel_data *data = ofono_modem_get_data(modem);
-
-	ofono_netreg_create(modem, 0, "atmodem", data->aux);
-}
-
-static struct ofono_modem_driver quectel_driver = {
-	.name			= "quectel",
-	.probe			= quectel_probe,
-	.remove			= quectel_remove,
-	.enable			= quectel_enable,
-	.disable		= quectel_disable,
-	.set_online		= quectel_set_online,
-	.pre_sim		= quectel_pre_sim,
-	.post_sim		= quectel_post_sim,
-	.post_online		= quectel_post_online,
-};
-
-static int quectel_init(void)
-{
-	return ofono_modem_driver_register(&quectel_driver);
-}
-
-static void quectel_exit(void)
-{
-	ofono_modem_driver_unregister(&quectel_driver);
-}
-
-OFONO_PLUGIN_DEFINE(quectel, "Quectel driver", VERSION,
-    OFONO_PLUGIN_PRIORITY_DEFAULT, quectel_init, quectel_exit)
--- a/ofono/plugins/ril.c
+++ b/ofono/plugins/ril.c
@@ -65,40 +65,40 @@
 #include <ofono/oemraw.h>
 #include <ofono/stk.h>

-#include "rildev.h"
 #include "drivers/rilmodem/rilmodem.h"

-#define MAX_POWER_ON_RETRIES	5
-#define MAX_SIM_STATUS_RETRIES	15
-#define RADIO_ID		1001
-#define MAX_PDP_CONTEXTS	2
-
-/* MCE definitions */
-#define MCE_SERVICE			"com.nokia.mce"
-#define MCE_SIGNAL_IF			"com.nokia.mce.signal"
-
-/* MCE signal definitions */
-#define MCE_DISPLAY_SIG			"display_status_ind"
-
-#define MCE_DISPLAY_ON_STRING		"on"
-
-/* transitional state between ON and OFF (3 seconds) */
-#define MCE_DISPLAY_DIM_STRING		"dimmed"
-#define MCE_DISPLAY_OFF_STRING		"off"
+#define MAX_POWER_ON_RETRIES 5
+#define MAX_SIM_STATUS_RETRIES 15
+#define RADIO_ID 1001
+#define MAX_PDP_CONTEXTS 2

 struct ril_data {
 	GRil *modem;
 	int power_on_retries;
 	int sim_status_retries;
 	ofono_bool_t connected;
+	ofono_bool_t have_sim;
 	ofono_bool_t online;
 	ofono_bool_t reported;
 	guint timer_id;
 };

+/* MCE definitions */
+#define MCE_SERVICE		"com.nokia.mce"
+#define MCE_SIGNAL_IF	"com.nokia.mce.signal"
+
+/* MCE signal definitions */
+#define MCE_DISPLAY_SIG	"display_status_ind"
+
+#define MCE_DISPLAY_ON_STRING	"on"
+/* transitional state between ON and OFF (3 seconds) */
+#define MCE_DISPLAY_DIM_STRING	"dimmed"
+#define MCE_DISPLAY_OFF_STRING	"off"
+
 static guint mce_daemon_watch;
 static guint signal_watch;
 static DBusConnection *connection;
+gboolean reconnecting = FALSE;

 static int ril_init(void);
 static void ril_exit(void);
@@ -113,12 +113,13 @@ static void ril_debug(const char *str, void *user_data)

 static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 {
-	DBG("error=%d", message->error);
 	struct ofono_modem *modem = user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct sim_status status;
 	struct sim_app *apps[MAX_UICC_APPS];

+	DBG("");
+
 	/*
 	 * ril.h claims this should NEVER fail!
 	 * However this isn't quite true.  So,
@@ -140,12 +141,17 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 		else
 			ofono_error("Max retries for GET_SIM_STATUS exceeded!");
 	} else {
+
 		/* Returns TRUE if cardstate == PRESENT */
 		if (ril_util_parse_sim_status(ril->modem, message,
 						&status, apps)) {
+			DBG("have_sim = TRUE; num_apps: %d",
+				status.num_apps);

 			if (status.num_apps)
 				ril_util_free_sim_apps(apps, status.num_apps);
+
+			ril->have_sim = TRUE;
 		} else {
 			ofono_warn("No SIM card present.");
 		}
@@ -183,7 +189,6 @@ static int send_get_sim_status(struct ofono_modem *modem)

 static int ril_probe(struct ofono_modem *modem)
 {
-	DBG("modem: %p", modem);
 	struct ril_data *ril = NULL;

 	ril = g_try_new0(struct ril_data, 1);
@@ -207,7 +212,7 @@ error:
 static void ril_remove(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
-	DBG("modem: %p ril: %p", modem, ril);
+

 	ofono_modem_set_data(modem, NULL);

@@ -220,24 +225,23 @@ static void ril_remove(struct ofono_modem *modem)
 	g_ril_unref(ril->modem);

 	g_free(ril);
-
-	g_dbus_remove_watch(connection, mce_daemon_watch);
-
-	if (signal_watch > 0)
-		g_dbus_remove_watch(connection, signal_watch);
 }

 static void ril_pre_sim(struct ofono_modem *modem)
 {
-	DBG("");
+	DBG("enter");
 	struct ril_data *ril = ofono_modem_get_data(modem);
-	ofono_sim_create(modem, 0, "rilmodem", ril->modem);
+	struct ofono_sim *sim;
+
+	sim = ofono_sim_create(modem, 0, "rilmodem", ril->modem);
 	ofono_voicecall_create(modem, 0, "rilmodem", ril->modem);
+
+	if (sim && ril->have_sim)
+		ofono_sim_inserted_notify(sim, TRUE);
 }

 static void ril_post_sim(struct ofono_modem *modem)
 {
-	DBG("");
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
@@ -273,7 +277,7 @@ static void ril_post_sim(struct ofono_modem *modem)

 static void ril_post_online(struct ofono_modem *modem)
 {
-	DBG("");
+	DBG("enter");
 	struct ril_data *ril = ofono_modem_get_data(modem);

 	ofono_call_volume_create(modem, 0, "rilmodem", ril->modem);
@@ -286,7 +290,7 @@ static void ril_post_online(struct ofono_modem *modem)

 static void ril_set_online_cb(struct ril_msg *message, gpointer user_data)
 {
-	DBG("");
+	DBG("enter");
 	struct cb_data *cbd = user_data;
 	ofono_modem_online_cb_t cb = cbd->cb;

@@ -308,13 +312,12 @@ static void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 1);	/* Number of params */
 	parcel_w_int32(&rilp, online);	/* Radio ON = 1, Radio OFF = 0 */
-
-	ofono_info("%s: RIL_REQUEST_RADIO_POWER %d", __func__, online);
+	DBG("1");
 	ret = g_ril_send(ril->modem, RIL_REQUEST_RADIO_POWER, rilp.data,
 				rilp.size, ril_set_online_cb, cbd, g_free);

 	parcel_free(&rilp);
-	DBG("RIL_REQUEST_RADIO_POWER done");
+	DBG("2");
 	if (ret <= 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(callback, data);
@@ -352,7 +355,6 @@ static int ril_screen_state(struct ofono_modem *modem, ofono_bool_t state)
 static gboolean display_changed(DBusConnection *conn,
 					DBusMessage *message, void *user_data)
 {
-	DBG("");
 	struct ofono_modem *modem = user_data;
 	DBusMessageIter iter;
 	const char *value;
@@ -375,7 +377,6 @@ static gboolean display_changed(DBusConnection *conn,

 static void mce_connect(DBusConnection *conn, void *user_data)
 {
-	DBG("");
 	signal_watch = g_dbus_add_signal_watch(conn,
 						MCE_SERVICE, NULL,
 						MCE_SIGNAL_IF,
@@ -386,26 +387,20 @@ static void mce_connect(DBusConnection *conn, void *user_data)

 static void mce_disconnect(DBusConnection *conn, void *user_data)
 {
-	DBG("");
 	g_dbus_remove_watch(conn, signal_watch);
 	signal_watch = 0;
 }

 static void ril_connected(struct ril_msg *message, gpointer user_data)
 {
-	DBG("");
-
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
-	int ril_version = 0;
-	struct parcel rilp;

-	ril_util_init_parcel(message, &rilp);
-	ril_version = parcel_r_int32(&rilp);
-	ofono_debug("%s: [UNSOL]< %s, RIL_VERSION %d",
-			__func__, ril_unsol_request_to_string(message->req),
-			ril_version);
+	/* TODO: make conditional */
+	ofono_debug("[UNSOL]< %s", ril_unsol_request_to_string(message->req));
+	/* TODO: make conditional */

+	/* TODO: need a disconnect function to restart things! */
 	ril->connected = TRUE;

 	send_get_sim_status(modem);
@@ -415,51 +410,46 @@ static void ril_connected(struct ril_msg *message, gpointer user_data)
 				mce_connect, mce_disconnect, modem, NULL);
 }

-static int create_gril(struct ofono_modem *modem);
-
-static gboolean connect_rild(gpointer user_data)
-
+static gboolean ril_re_init(gpointer user_data)
 {
-	struct ofono_modem *modem = (struct ofono_modem *) user_data;
-
-	ofono_info("%s: Connecting %p to rild...", __func__, modem);
-
-	if (create_gril(modem) < 0) {
-		DBG("Connecting %p to rild failed, retry timer continues...",
-				modem);
+	if (reconnecting) {
+		ril_init();
 		return TRUE;
+	} else {
+		return FALSE;
 	}
-
-
-	return FALSE;
 }

-/* RIL socket callback from g_io channel */
 static void gril_disconnected(gpointer user_data)
 {
+	/* Signal clients modem going down
+	 */
 	struct ofono_modem *modem = user_data;
-	ofono_error("%s: modem: %p", __func__, modem);
 	DBusConnection *conn = ofono_dbus_get_connection();

 	if (ofono_modem_is_registered(modem)) {
+		ofono_modem_remove(modem);
 		mce_disconnect(conn, user_data);
-		ril_modem_remove(modem);
 	}

+	if (!reconnecting) {
+		reconnecting = TRUE;
+		g_timeout_add_seconds(2, ril_re_init, NULL);
+	}
 }

 void ril_switchUser()
 {
 	if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0)
-		ofono_error("%s: prctl(PR_SET_KEEPCAPS) failed:%s,%d",
-				__func__, strerror(errno), errno);
+		ofono_error("prctl(PR_SET_KEEPCAPS) failed:%s,%d",
+							strerror(errno), errno);

 	if (setgid(RADIO_ID) < 0)
-		ofono_error("%s: setgid(%d) failed:%s,%d",
-				__func__, RADIO_ID, strerror(errno), errno);
+		ofono_error("setgid(%d) failed:%s,%d",
+				RADIO_ID, strerror(errno), errno);
 	if (setuid(RADIO_ID) < 0)
-		ofono_error("%s: setuid(%d) failed:%s,%d",
-				__func__, RADIO_ID, strerror(errno), errno);
+		ofono_error("setuid(%d) failed:%s,%d",
+				RADIO_ID, strerror(errno), errno);

 	struct __user_cap_header_struct header;
 	struct __user_cap_data_struct cap;
@@ -470,21 +460,22 @@ void ril_switchUser()
 	cap.inheritable = 0;

 	if (syscall(SYS_capset, &header, &cap) < 0)
-		ofono_error("%s: syscall(SYS_capset) failed:%s,%d",
-				__func__, strerror(errno), errno);
+		ofono_error("syscall(SYS_capset) failed:%s,%d",
+							strerror(errno), errno);

 }

-static int create_gril(struct ofono_modem *modem)
+static int ril_enable(struct ofono_modem *modem)
 {
-	DBG(" modem: %p", modem);
+	DBG("enter");
 	struct ril_data *ril = ofono_modem_get_data(modem);

+	ril->have_sim = FALSE;
+
 	/* RIL expects user radio */
 	ril_switchUser();

 	ril->modem = g_ril_new();
-
 	g_ril_set_disconnect_function(ril->modem, gril_disconnected, modem);

 	/* NOTE: Since AT modems open a tty, and then call
@@ -497,9 +488,12 @@ static int create_gril(struct ofono_modem *modem)

 	if (ril->modem == NULL) {
 		DBG("g_ril_new() failed to create modem!");
+		gril_disconnected(modem);
 		return -EIO;
 	}

+	reconnecting = FALSE;
+
 	if (getenv("OFONO_RIL_TRACE"))
 		g_ril_set_trace(ril->modem, TRUE);

@@ -511,39 +505,22 @@ static int create_gril(struct ofono_modem *modem)

 	ofono_devinfo_create(modem, 0, "rilmodem", ril->modem);

-	return 0;
-}
-
-
-static int ril_enable(struct ofono_modem *modem)
-{
-	int ret;
-	DBG("");
-
-	ret = create_gril(modem);
-	if (ret < 0) {
-		DBG("create gril: %d, queue reconnect", ret);
-		g_timeout_add_seconds(2,
-			connect_rild, modem);
-	}
-
 	return -EINPROGRESS;
 }

 static int ril_disable(struct ofono_modem *modem)
 {
-	DBG("%p", modem);
-
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct parcel rilp;
 	int request = RIL_REQUEST_RADIO_POWER;
 	guint ret;

+	DBG("%p", modem);
+
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 1); /* size of array */
 	parcel_w_int32(&rilp, 0); /* POWER=OFF */

-	ofono_info("%s: RIL_REQUEST_RADIO_POWER OFF", __func__);
 	/* fire and forget i.e. not waiting for the callback*/
 	ret = g_ril_send(ril->modem, request, rilp.data,
 			 rilp.size, NULL, NULL, NULL);
@@ -553,10 +530,6 @@ static int ril_disable(struct ofono_modem *modem)

 	parcel_free(&rilp);

-	/* this will trigger the cleanup of g_io_channel */
-	g_ril_unref(ril->modem);
-	ril->modem = NULL;
-
 	return 0;
 }

@@ -572,19 +545,67 @@ static struct ofono_modem_driver ril_driver = {
 	.set_online = ril_set_online,
 };

+/*
+ * Note - as an aal+ container doesn't include a running udev,
+ * the udevng plugin will never detect a modem, and thus modem
+ * creation for a RIL-based modem needs to be hard-coded.
+ *
+ * Typically, udevng would create the modem, which in turn would
+ * lead to this plugin's probe function being called.
+ *
+ * This is a first attempt at registering like this.
+ *
+ * IMPORTANT - this code relies on the fact that the 'rilmodem' is
+ * added to top-level Makefile's builtin_modules *after* 'ril'.
+ * This has means 'rilmodem' will already be registered before we try
+ * to create and register the modem.  In standard ofono, 'udev'/'udevng'
+ * is initialized last due to the fact that it's the first module
+ * added in the top-level Makefile.
+ */
 static int ril_init(void)
 {
-	int retval = ofono_modem_driver_register(&ril_driver);
-	if (retval)
+	DBG("enter");
+	int retval = 0;
+	struct ofono_modem *modem;
+
+	if ((retval = ofono_modem_driver_register(&ril_driver))) {
 		DBG("ofono_modem_driver_register returned: %d", retval);
+	return retval;
+	}
+
+	/* everything after _modem_driver_register, is
+	 * non-standard ( see udev comment above ).
+	 * usually called by undevng::create_modem
+	 *
+	 * args are name (optional) & type
+	 */
+	modem = ofono_modem_create("ril_0", "ril");
+	if (modem == NULL) {
+		DBG("ofono_modem_create failed for ril");
+		return -ENODEV;
+	}
+
+	/* This causes driver->probe() to be called... */
+	retval = ofono_modem_register(modem);
+	DBG("ofono_modem_register returned: %d", retval);

 	return retval;
 }

 static void ril_exit(void)
 {
+	DBG("");
+	if (current_passwd)
+		g_free(current_passwd);
+
+	g_dbus_remove_watch(connection, mce_daemon_watch);
+
+	if (signal_watch > 0)
+		g_dbus_remove_watch(connection, signal_watch);
+
 	ofono_modem_driver_unregister(&ril_driver);
 }

-OFONO_PLUGIN_DEFINE(ril, "RIL modem plugin", VERSION,
+OFONO_PLUGIN_DEFINE(ril, "RIL modem driver", VERSION,
 			OFONO_PLUGIN_PRIORITY_DEFAULT, ril_init, ril_exit)
+
--- a/ofono/plugins/rildev.c
+++ b/ofono/plugins/rildev.c
@@ -1,299 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2014 Canonical Ltd.
- *  Copyright (C) 2015 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
- *  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.
- *
- *  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
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-#include <glib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/inotify.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-#include <ofono/modem.h>
-#include <ofono/log.h>
-
-#include "rildev.h"
-
-#define EVENT_SIZE (sizeof(struct inotify_event))
- /*
-  * As a best guess use a buffer size of 100 inotify events.
-  * NAME_MAX+1 from inotify documentation.
-  */
-#define IBUF_LEN (100*(EVENT_SIZE + NAME_MAX + 1))
-
-static int inotify_fd = -1;
-static int inotify_watch_id = -1;
-static guint inotify_watch_source_id;
-static GIOChannel *inotify_watch_channel;
-
-static GSList *modem_list;
-static int watch_for_rild_socket(void);
-static void detect_rild(void);
-
-static struct ofono_modem *find_ril_modem(int slot)
-{
-	GSList *list;
-
-	for (list = modem_list; list; list = list->next) {
-		struct ofono_modem *modem = list->data;
-		int ril_slot = ofono_modem_get_integer(modem, "Slot");
-
-		if (ril_slot == slot)
-			return modem;
-	}
-
-	return NULL;
-}
-
-static void remove_watchers(void)
-{
-	DBG("");
-	if (inotify_watch_channel == NULL)
-		return;
-
-	g_source_remove(inotify_watch_source_id);
-	inotify_watch_source_id = 0;
-	g_io_channel_unref(inotify_watch_channel);
-	inotify_watch_channel = NULL;
-	inotify_rm_watch(inotify_fd, inotify_watch_id);
-	inotify_watch_id = -1;
-	close(inotify_fd);
-	inotify_fd = -1;
-}
-
-/* Removes a RIL modem and initiates a sequence to create a new one */
-void ril_modem_remove(struct ofono_modem *modem)
-{
-	DBG("modem: %p", modem);
-	struct ofono_modem *list_modem;
-	int slot = -1;
-	list_modem = NULL;
-
-	if (modem)
-		slot = ofono_modem_get_integer(modem, "Slot");
-
-	if (slot >= 0)
-		list_modem = find_ril_modem(slot);
-
-	if (list_modem) {
-		ofono_modem_remove(modem);
-		modem_list = g_slist_remove(modem_list, list_modem);
-	}
-
-	detect_rild();
-}
-
-/* return: 0 if successful or modem already exists, otherwise and error */
-static int create_rilmodem(const char *ril_type, int slot)
-{
-	struct ofono_modem *modem;
-	char dev_name[64];
-	int retval;
-	DBG("");
-	snprintf(dev_name, sizeof(dev_name), "ril_%d", slot);
-
-	/* Check that not created already */
-	if (find_ril_modem(slot))
-		return 0;
-
-	/* Currently there is only one ril implementation, create always */
-	modem = ofono_modem_create(dev_name, ril_type);
-	if (modem == NULL) {
-		DBG("ofono_modem_create failed for type: %s", ril_type);
-		return -ENODEV;
-	}
-	DBG("created modem: %p", modem);
-
-	modem_list = g_slist_prepend(modem_list, modem);
-
-	ofono_modem_set_integer(modem, "Slot", slot);
-
-	/* This causes driver->probe() to be called */
-	retval = ofono_modem_register(modem);
-	if (retval != 0) {
-		ofono_error("%s: ofono_modem_register error: %d",
-				__func__, retval);
-		return retval;
-	}
-
-	return 0;
-}
-
-/*
- * Try creating a ril modem
- * return: false if failed, true successful or modem already exists.
- */
-static gboolean try_create_modem()
-{
-	gboolean result = FALSE;
-	int ares = access(RILD_CMD_SOCKET, F_OK);
-	if (ares != -1)
-		result = !create_rilmodem("ril", 0);
-	else
-		DBG("problems accessing rild socket: %d", ares);
-
-	return result;
-}
-
-static gboolean rild_inotify(GIOChannel *gio, GIOCondition c,
-		gpointer data)
-{
-	DBG("");
-	struct inotify_event *event = 0;
-	int i = 0;
-	int length = 0;
-	char *ievents = 0; /* inotify event buffer */
-	gboolean result = TRUE;
-
-	ievents = g_try_malloc(IBUF_LEN);
-	if (!ievents) {
-		/* Continue observing so don't set "result" false here */
-		goto end;
-	}
-
-	length = read(inotify_fd, ievents, IBUF_LEN);
-	/*
-	 * If iNotify fd read returns an error, just keep on watching for
-	 * read events.
-	 */
-	while (i < length) {
-		event = (struct inotify_event *) &ievents[i];
-
-		if (event->len && (event->mask & IN_CREATE)
-			&& (!(event->mask & IN_ISDIR))) {
-
-			DBG("File created: %s", event->name);
-			if (!strcmp(event->name, RILD_SOCKET_FILE)) {
-				result = !try_create_modem();
-				/*
-				 * On modem create fail continue observing
-				 * events so don't set result false here.
-				 */
-				goto end;
-			}
-		}
-		i += EVENT_SIZE + event->len;
-	}
-
-end:
-	/* "if" works around potential glib runtime warning */
-	if (ievents)
-		g_free(ievents);
-
-	if (!result)
-		remove_watchers();
-
-	return result;
-}
-
-/* return 0 if successful, otherwise an error */
-static int watch_for_rild_socket(void)
-{
-	DBG("");
-	inotify_fd = inotify_init();
-	if (inotify_fd < 0)
-		return -EIO;
-
-	inotify_watch_channel = g_io_channel_unix_new(inotify_fd);
-	if (inotify_watch_channel == NULL) {
-		ofono_error("%s: rildev gio chan creation fail!", __func__);
-		close(inotify_fd);
-		inotify_fd = -1;
-		return -EIO;
-	}
-
-	inotify_watch_id = inotify_add_watch(inotify_fd, RILD_SOCKET_DIR,
-						IN_CREATE);
-	if (inotify_watch_id < 0) {
-		ofono_error("%s: inotify says: %d, errno: %d",
-				__func__, inotify_watch_id, errno);
-		g_io_channel_unref(inotify_watch_channel);
-		inotify_watch_channel = NULL;
-		close(inotify_fd);
-		inotify_fd = -1;
-		return -EIO;
-	}
-
-	inotify_watch_source_id = g_io_add_watch(inotify_watch_channel,
-							G_IO_IN,
-							rild_inotify, NULL);
-	if (inotify_watch_source_id <= 0) {
-		ofono_error("%s: rildev add gio watch fail!", __func__);
-		g_io_channel_unref(inotify_watch_channel);
-		inotify_watch_channel = NULL;
-		inotify_rm_watch(inotify_fd, inotify_watch_id);
-		inotify_watch_id = -1;
-		close(inotify_fd);
-		inotify_fd = -1;
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static void detect_rild(void)
-{
-	DBG("");
-	gboolean created = try_create_modem();
-	if (!created)
-		watch_for_rild_socket();
-
-	/* Let's re-check if we just missed the notification */
-	if (!created && try_create_modem())
-		remove_watchers();
-}
-
-static int detect_init(void)
-{
-	DBG("");
-	detect_rild();
-	return 0;
-}
-
-static void detect_exit(void)
-{
-	GSList *list;
-
-	DBG("");
-
-	for (list = modem_list; list; list = list->next) {
-		struct ofono_modem *modem = list->data;
-
-		ofono_modem_remove(modem);
-	}
-
-	g_slist_free(modem_list);
-	modem_list = NULL;
-	remove_watchers();
-}
-
-OFONO_PLUGIN_DEFINE(rildev, "RIL type detection", VERSION,
-		OFONO_PLUGIN_PRIORITY_DEFAULT, detect_init, detect_exit)
--- a/ofono/plugins/rildev.h
+++ b/ofono/plugins/rildev.h
@@ -1,32 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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
- *  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.
- *
- *  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 __RILDEV_H
-#define __RILDEV_H
-
-#define RILD_CMD_SOCKET "/dev/socket/rild"
-#define RILD_SOCKET_DIR "/dev/socket"
-#define RILD_SOCKET_FILE "rild"
-
-
-void ril_modem_remove(struct ofono_modem *modem);
-
-#endif /* __RILDEV_H */
--- a/ofono/plugins/ublox.c
+++ b/ofono/plugins/ublox.c
@@ -1,292 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2014  Philip Paeps. 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.
- *
- *  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
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <stdlib.h>
-
-#include <glib.h>
-#include <gatchat.h>
-#include <gattty.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-#include <ofono/modem.h>
-#include <ofono/devinfo.h>
-#include <ofono/netreg.h>
-#include <ofono/sim.h>
-#include <ofono/gprs.h>
-#include <ofono/gprs-context.h>
-
-#include <drivers/atmodem/atutil.h>
-#include <drivers/atmodem/vendor.h>
-
-static const char *none_prefix[] = { NULL };
-
-struct ublox_data {
-	GAtChat *modem;
-	GAtChat *aux;
-};
-
-static void ublox_debug(const char *str, void *user_data)
-{
-	const char *prefix = user_data;
-
-	ofono_info("%s%s", prefix, str);
-}
-
-static int ublox_probe(struct ofono_modem *modem)
-{
-	struct ublox_data *data;
-
-	DBG("%p", modem);
-
-	data = g_try_new0(struct ublox_data, 1);
-	if (data == NULL)
-		return -ENOMEM;
-
-	ofono_modem_set_data(modem, data);
-
-	return 0;
-}
-
-static void ublox_remove(struct ofono_modem *modem)
-{
-	struct ublox_data *data = ofono_modem_get_data(modem);
-
-	DBG("%p", modem);
-
-	ofono_modem_set_data(modem, NULL);
-	g_at_chat_unref(data->aux);
-	g_at_chat_unref(data->modem);
-	g_free(data);
-}
-
-static GAtChat *open_device(struct ofono_modem *modem,
-				const char *key, char *debug)
-{
-	const char *device;
-	GAtSyntax *syntax;
-	GIOChannel *channel;
-	GAtChat *chat;
-
-	device = ofono_modem_get_string(modem, key);
-	if (device == NULL)
-		return NULL;
-
-	DBG("%s %s", key, device);
-
-	channel = g_at_tty_open(device, NULL);
-	if (channel == NULL)
-		return NULL;
-
-	syntax = g_at_syntax_new_gsm_permissive();
-	chat = g_at_chat_new(channel, syntax);
-	g_at_syntax_unref(syntax);
-
-	g_io_channel_unref(channel);
-
-	if (chat == NULL)
-		return NULL;
-
-	if (getenv("OFONO_AT_DEBUG"))
-		g_at_chat_set_debug(chat, ublox_debug, debug);
-
-	return chat;
-}
-
-static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct ublox_data * data = ofono_modem_get_data(modem);
-
-	DBG("ok %d", ok);
-
-	if (!ok) {
-		g_at_chat_unref(data->aux);
-		data->aux = NULL;
-		g_at_chat_unref(data->modem);
-		data->modem = NULL;
-		ofono_modem_set_powered(modem, FALSE);
-		return;
-	}
-
-	ofono_modem_set_powered(modem, TRUE);
-}
-
-static int ublox_enable(struct ofono_modem *modem)
-{
-	struct ublox_data *data = ofono_modem_get_data(modem);
-
-	DBG("%p", modem);
-
-	data->modem = open_device(modem, "Modem", "Modem: ");
-	if (data->modem == NULL)
-		return -EINVAL;
-
-	data->aux = open_device(modem, "Aux", "Aux: ");
-	if (data->aux == NULL) {
-		g_at_chat_unref(data->modem);
-		data->modem = NULL;
-		return -EIO;
-	}
-
-	g_at_chat_set_slave(data->modem, data->aux);
-
-	g_at_chat_send(data->modem, "ATE0 +CMEE=1", none_prefix,
-					NULL, NULL, NULL);
-	g_at_chat_send(data->aux, "ATE0 +CMEE=1", none_prefix,
-					NULL, NULL, NULL);
-
-	g_at_chat_send(data->aux, "AT+CFUN=4", none_prefix,
-					cfun_enable, modem, NULL);
-
-	return -EINPROGRESS;
-}
-
-static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct ublox_data *data = ofono_modem_get_data(modem);
-
-	DBG("");
-
-	g_at_chat_unref(data->aux);
-	data->aux = NULL;
-
-	if (ok)
-		ofono_modem_set_powered(modem, FALSE);
-}
-
-static int ublox_disable(struct ofono_modem *modem)
-{
-	struct ublox_data *data = ofono_modem_get_data(modem);
-
-	DBG("%p", modem);
-
-	g_at_chat_cancel_all(data->modem);
-	g_at_chat_unregister_all(data->modem);
-	g_at_chat_unref(data->modem);
-	data->modem = NULL;
-
-	g_at_chat_cancel_all(data->aux);
-	g_at_chat_unregister_all(data->aux);
-
-	g_at_chat_send(data->aux, "AT+CFUN=0", none_prefix,
-					cfun_disable, modem, NULL);
-
-	return -EINPROGRESS;
-}
-
-static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_modem_online_cb_t cb = cbd->cb;
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-	cb(&error, cbd->data);
-}
-
-static void ublox_set_online(struct ofono_modem *modem, ofono_bool_t online,
-				ofono_modem_online_cb_t cb, void *user_data)
-{
-	struct ublox_data *data = ofono_modem_get_data(modem);
-	struct cb_data *cbd = cb_data_new(cb, user_data);
-	char const *command = online ? "AT+CFUN=1" : "AT+CFUN=4";
-
-	DBG("modem %p %s", modem, online ? "online" : "offline");
-
-	if (g_at_chat_send(data->aux, command, none_prefix, set_online_cb,
-					cbd, g_free) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, cbd->data);
-
-	g_free(cbd);
-}
-
-static void ublox_pre_sim(struct ofono_modem *modem)
-{
-	struct ublox_data *data = ofono_modem_get_data(modem);
-	struct ofono_sim *sim;
-
-	DBG("%p", modem);
-
-	ofono_devinfo_create(modem, 0, "atmodem", data->aux);
-	sim = ofono_sim_create(modem, OFONO_VENDOR_UBLOX, "atmodem",
-					data->aux);
-
-	if (sim)
-		ofono_sim_inserted_notify(sim, TRUE);
-}
-
-static void ublox_post_sim(struct ofono_modem *modem)
-{
-	struct ublox_data *data = ofono_modem_get_data(modem);
-	struct ofono_gprs *gprs;
-	struct ofono_gprs_context *gc;
-
-	DBG("%p", modem);
-
-	gprs = ofono_gprs_create(modem, OFONO_VENDOR_UBLOX, "atmodem",
-					data->aux);
-	gc = ofono_gprs_context_create(modem, OFONO_VENDOR_UBLOX, "atmodem",
-					data->modem);
-
-	if (gprs && gc)
-		ofono_gprs_add_context(gprs, gc);
-}
-
-static void ublox_post_online(struct ofono_modem *modem)
-{
-	struct ublox_data *data = ofono_modem_get_data(modem);
-
-	ofono_netreg_create(modem, 0, "atmodem", data->aux);
-}
-
-static struct ofono_modem_driver ublox_driver = {
-	.name		= "ublox",
-	.probe		= ublox_probe,
-	.remove		= ublox_remove,
-	.enable		= ublox_enable,
-	.disable	= ublox_disable,
-	.set_online	= ublox_set_online,
-	.pre_sim	= ublox_pre_sim,
-	.post_sim	= ublox_post_sim,
-	.post_online	= ublox_post_online,
-};
-
-static int ublox_init(void)
-{
-	return ofono_modem_driver_register(&ublox_driver);
-}
-
-static void ublox_exit(void)
-{
-	ofono_modem_driver_unregister(&ublox_driver);
-}
-
-OFONO_PLUGIN_DEFINE(ublox, "u-blox modem driver", VERSION,
-		OFONO_PLUGIN_PRIORITY_DEFAULT, ublox_init, ublox_exit)
--- a/ofono/plugins/udevng.c
+++ b/ofono/plugins/udevng.c
@@ -636,7 +636,7 @@ static gboolean setup_telit(struct modem_info *modem)

 static gboolean setup_he910(struct modem_info *modem)
 {
-	const char *mdm = NULL, *aux = NULL, *gps = NULL;
+	const char *mdm = NULL, *aux = NULL;
 	GSList *list;

 	DBG("%s", modem->syspath);
@@ -652,19 +652,16 @@ static gboolean setup_he910(struct modem_info *modem)
 				mdm = info->devnode;
 			else if (g_strcmp0(info->number, "06") == 0)
 				aux = info->devnode;
-			else if (g_strcmp0(info->number, "0a") == 0)
-				gps = info->devnode;
 		}
 	}

 	if (aux == NULL || mdm == NULL)
 		return FALSE;

-	DBG("modem=%s aux=%s gps=%s", mdm, aux, gps);
+	DBG("modem=%s aux=%s", mdm, aux);

 	ofono_modem_set_string(modem->modem, "Modem", mdm);
 	ofono_modem_set_string(modem->modem, "Aux", aux);
-	ofono_modem_set_string(modem->modem, "GPS", gps);

 	return TRUE;
 }
@@ -794,86 +791,6 @@ static gboolean setup_samsung(struct modem_info *modem)
 	return TRUE;
 }

-static gboolean setup_quectel(struct modem_info *modem)
-{
-	const char *aux = NULL, *mdm = NULL;
-	GSList *list;
-
-	DBG("%s", modem->syspath);
-
-	for (list = modem->devices; list; list = list->next) {
-		struct device_info *info = list->data;
-
-		DBG("%s %s %s %s", info->devnode, info->interface,
-						info->number, info->label);
-
-		if (g_strcmp0(info->label, "aux") == 0) {
-			aux = info->devnode;
-			if (mdm != NULL)
-				break;
-		} else if (g_strcmp0(info->label, "modem") == 0) {
-			mdm = info->devnode;
-			if (aux != NULL)
-				break;
-		} else if (g_strcmp0(info->interface, "255/255/255") == 0) {
-			if (g_strcmp0(info->number, "02") == 0)
-				aux = info->devnode;
-			else if (g_strcmp0(info->number, "03") == 0)
-				mdm = info->devnode;
-		}
-	}
-
-	if (aux == NULL || mdm == NULL)
-		return FALSE;
-
-	DBG("aux=%s modem=%s", aux, mdm);
-
-	ofono_modem_set_string(modem->modem, "Aux", aux);
-	ofono_modem_set_string(modem->modem, "Modem", mdm);
-
-	return TRUE;
-}
-
-static gboolean setup_ublox(struct modem_info *modem)
-{
-	const char *aux = NULL, *mdm = NULL;
-	GSList *list;
-
-	DBG("%s", modem->syspath);
-
-	for (list = modem->devices; list; list = list->next) {
-		struct device_info *info = list->data;
-
-		DBG("%s %s %s %s", info->devnode, info->interface,
-					info->number, info->label);
-
-		if (g_strcmp0(info->label, "aux") == 0) {
-			aux = info->devnode;
-			if (mdm != NULL)
-				break;
-		} else if (g_strcmp0(info->label, "modem") == 0) {
-			mdm = info->devnode;
-			if (aux != NULL)
-				break;
-		} else if (g_strcmp0(info->interface, "2/2/1") == 0) {
-			if (g_strcmp0(info->number, "02") == 0)
-				aux = info->devnode;
-			else if (g_strcmp0(info->number, "00") == 0)
-				mdm = info->devnode;
-		}
-	}
-
-	if (aux == NULL || mdm == NULL)
-		return FALSE;
-
-	DBG("aux=%s modem=%s", aux, mdm);
-
-	ofono_modem_set_string(modem->modem, "Aux", aux);
-	ofono_modem_set_string(modem->modem, "Modem", mdm);
-
-	return TRUE;
-}
-
 static struct {
 	const char *name;
 	gboolean (*setup)(struct modem_info *modem);
@@ -898,8 +815,6 @@ static struct {
 	{ "zte",	setup_zte	},
 	{ "icera",	setup_icera	},
 	{ "samsung",	setup_samsung	},
-	{ "quectel",	setup_quectel	},
-	{ "ublox",	setup_ublox	},
 	{ }
 };

@@ -1111,8 +1026,6 @@ static struct {
 	{ "nokia",	"option",	"0421", "0623"	},
 	{ "samsung",	"option",	"04e8", "6889"	},
 	{ "samsung",	"kalmia"			},
-	{ "quectel",	"option",	"05c6", "9090"	},
-	{ "ublox",	"cdc_acm",	"1546", "1102"	},
 	{ }
 };

--- a/ofono/src/call-forwarding.c
+++ b/ofono/src/call-forwarding.c
@@ -411,12 +411,9 @@ static void set_new_cond_list(struct ofono_call_forwarding *cf,
 				number = phone_number_to_string(
 							&lc->phone_number);

-			snprintf(attr, sizeof(attr), "%s%s",
-				bearer_class_to_string(lc->cls), cf_type_lut[i]);
-
 			ofono_dbus_signal_property_changed(conn, path,
 						OFONO_CALL_FORWARDING_INTERFACE,
-						attr,
+						cf_type_lut[i],
 						DBUS_TYPE_STRING, &number);
 		}

--- a/ofono/src/emulator.c
+++ b/ofono/src/emulator.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdbool.h>

 #include <glib.h>

@@ -43,18 +42,17 @@ struct ofono_emulator {
 	enum ofono_emulator_type type;
 	GAtServer *server;
 	GAtPPP *ppp;
+	gboolean slc;
 	int l_features;
 	int r_features;
+	int events_mode;
+	gboolean events_ind;
+	unsigned char cmee_mode;
 	GSList *indicators;
 	guint callsetup_source;
+	gboolean clip;
+	gboolean ccwa;
 	int pns_id;
-	bool slc : 1;
-	unsigned int events_mode : 2;
-	bool events_ind : 1;
-	unsigned int cmee_mode : 2;
-	bool clip : 1;
-	bool ccwa : 1;
-	bool ddr_active : 1;
 };

 struct indicator {
@@ -455,7 +453,7 @@ static void brsf_cb(GAtServer *server, GAtServerRequestType type,
 		if (g_at_result_iter_next_number(&iter, &val) == FALSE)
 			goto fail;

-		if (val < 0 || val > 0xffff)
+		if (val < 0 || val > 255)
 			goto fail;

 		em->r_features = val;
@@ -638,8 +636,7 @@ done:

 		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);

-		__ofono_emulator_slc_condition(em,
-					OFONO_EMULATOR_SLC_CONDITION_CMER);
+		em->slc = TRUE;
 		break;
 	}

@@ -829,113 +826,6 @@ fail:
 	}
 }

-static void bind_cb(GAtServer *server, GAtServerRequestType type,
-			GAtResult *result, gpointer user_data)
-{
-	struct ofono_emulator *em = user_data;
-	char buf[128];
-
-	switch (type) {
-	case G_AT_SERVER_REQUEST_TYPE_QUERY:
-		g_at_server_send_info(em->server, "+BIND: 1,1", TRUE);
-		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
-
-		__ofono_emulator_slc_condition(em,
-					OFONO_EMULATOR_SLC_CONDITION_BIND);
-		break;
-
-	case G_AT_SERVER_REQUEST_TYPE_SUPPORT:
-		sprintf(buf, "+BIND: (1)");
-		g_at_server_send_info(em->server, buf, TRUE);
-		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
-		break;
-
-	case G_AT_SERVER_REQUEST_TYPE_SET:
-	{
-		GAtResultIter iter;
-		int hf_indicator;
-		int num_hf_indicators = 0;
-
-		g_at_result_iter_init(&iter, result);
-		g_at_result_iter_next(&iter, "");
-
-		/* check validity of the request */
-		while (num_hf_indicators < 20 &&
-				g_at_result_iter_next_number(&iter,
-							&hf_indicator)) {
-			if (hf_indicator > 0xffff)
-				goto fail;
-
-			num_hf_indicators += 1;
-		}
-
-		/* Check that we have nothing extra in the stream */
-		if (g_at_result_iter_skip_next(&iter) == TRUE)
-			goto fail;
-
-		/* request is valid, update the indicator activation status */
-		g_at_result_iter_init(&iter, result);
-		g_at_result_iter_next(&iter, "");
-
-		while (g_at_result_iter_next_number(&iter, &hf_indicator))
-			ofono_info("HF supports indicator: 0x%04x",
-					hf_indicator);
-
-		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
-
-		break;
-	}
-
-	default:
-fail:
-		g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
-		break;
-	}
-}
-
-static void biev_cb(GAtServer *server, GAtServerRequestType type,
-			GAtResult *result, gpointer user_data)
-{
-	struct ofono_emulator *em = user_data;
-
-	switch (type) {
-	case G_AT_SERVER_REQUEST_TYPE_SET:
-	{
-		GAtResultIter iter;
-		int hf_indicator;
-		int val;
-
-		g_at_result_iter_init(&iter, result);
-		g_at_result_iter_next(&iter, "");
-
-		if (g_at_result_iter_next_number(&iter, &hf_indicator) == FALSE)
-			goto fail;
-
-		if (hf_indicator != HFP_HF_INDICATOR_ENHANCED_SAFETY)
-			goto fail;
-
-		if (em->ddr_active == FALSE)
-			goto fail;
-
-		if (g_at_result_iter_next_number(&iter, &val) == FALSE)
-			goto fail;
-
-		if (val < 0 || val > 1)
-			goto fail;
-
-		ofono_info("Enhanced Safety indicator: %d", val);
-
-		g_at_server_send_final(server, G_AT_SERVER_RESULT_OK);
-		break;
-	}
-
-	default:
-fail:
-		g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
-		break;
-	}
-}
-
 static void emulator_add_indicator(struct ofono_emulator *em, const char* name,
 					int min, int max, int dflt,
 					gboolean mandatory)
@@ -1016,8 +906,6 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
 						em);

 	if (em->type == OFONO_EMULATOR_TYPE_HFP) {
-		em->ddr_active = true;
-
 		emulator_add_indicator(em, OFONO_EMULATOR_IND_SERVICE, 0, 1, 0,
 									FALSE);
 		emulator_add_indicator(em, OFONO_EMULATOR_IND_CALL, 0, 1, 0,
@@ -1040,8 +928,6 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
 		g_at_server_register(em->server, "+CCWA", ccwa_cb, em, NULL);
 		g_at_server_register(em->server, "+CMEE", cmee_cb, em, NULL);
 		g_at_server_register(em->server, "+BIA", bia_cb, em, NULL);
-		g_at_server_register(em->server, "+BIND", bind_cb, em, NULL);
-		g_at_server_register(em->server, "+BIEV", biev_cb, em, NULL);
 	}

 	__ofono_atom_register(em->atom, emulator_unregister);
@@ -1095,7 +981,6 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
 	em->l_features |= HFP_AG_FEATURE_ENHANCED_CALL_STATUS;
 	em->l_features |= HFP_AG_FEATURE_ENHANCED_CALL_CONTROL;
 	em->l_features |= HFP_AG_FEATURE_EXTENDED_RES_CODE;
-	em->l_features |= HFP_AG_FEATURE_HF_INDICATORS;
 	em->events_mode = 3;	/* default mode is forwarding events */
 	em->cmee_mode = 0;	/* CME ERROR disabled by default */

@@ -1187,11 +1072,16 @@ struct ofono_emulator_request {
 };

 static void handler_proxy(GAtServer *server, GAtServerRequestType type,
-					GAtResult *result, gpointer userdata)
+				GAtResult *result, gpointer userdata)
 {
 	struct handler *h = userdata;
 	struct ofono_emulator_request req;

+	if (h->em->type == OFONO_EMULATOR_TYPE_HFP && h->em->slc == FALSE) {
+		g_at_server_send_final(h->em->server, G_AT_SERVER_RESULT_ERROR);
+		return;
+	}
+
 	switch (type) {
 	case G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY:
 		req.type = OFONO_EMULATOR_REQUEST_TYPE_COMMAND_ONLY;
@@ -1212,33 +1102,6 @@ static void handler_proxy(GAtServer *server, GAtServerRequestType type,
 	h->cb(h->em, &req, h->data);
 }

-static void handler_proxy_need_slc(GAtServer *server,
-					GAtServerRequestType type,
-					GAtResult *result, gpointer userdata)
-{
-	struct handler *h = userdata;
-
-	if (h->em->slc == FALSE) {
-		g_at_server_send_final(h->em->server, G_AT_SERVER_RESULT_ERROR);
-		return;
-	}
-
-	handler_proxy(server, type, result, userdata);
-}
-
-static void handler_proxy_chld(GAtServer *server, GAtServerRequestType type,
-				GAtResult *result, gpointer userdata)
-{
-	struct handler *h = userdata;
-
-	if (h->em->slc == FALSE && type != G_AT_SERVER_REQUEST_TYPE_SUPPORT) {
-		g_at_server_send_final(h->em->server, G_AT_SERVER_RESULT_ERROR);
-		return;
-	}
-
-	handler_proxy(server, type, result, userdata);
-}
-
 static void handler_destroy(gpointer userdata)
 {
 	struct handler *h = userdata;
@@ -1255,7 +1118,6 @@ ofono_bool_t ofono_emulator_add_handler(struct ofono_emulator *em,
 					void *data, ofono_destroy_func destroy)
 {
 	struct handler *h;
-	GAtServerNotifyFunc func = handler_proxy;

 	h = g_new0(struct handler, 1);
 	h->cb = cb;
@@ -1263,14 +1125,7 @@ ofono_bool_t ofono_emulator_add_handler(struct ofono_emulator *em,
 	h->destroy = destroy;
 	h->em = em;

-	if (em->type == OFONO_EMULATOR_TYPE_HFP) {
-		func = handler_proxy_need_slc;
-
-		if (!strcmp(prefix, "+CHLD"))
-			func = handler_proxy_chld;
-	}
-
-	if (g_at_server_register(em->server, prefix, func, h,
+	if (g_at_server_register(em->server, prefix, handler_proxy, h,
 					handler_destroy) == TRUE)
 		return TRUE;

@@ -1411,52 +1266,3 @@ void __ofono_emulator_set_indicator_forced(struct ofono_emulator *em,
 			ind->deferred = TRUE;
 	}
 }
-
-void __ofono_emulator_slc_condition(struct ofono_emulator *em,
-					enum ofono_emulator_slc_condition cond)
-{
-	if (em->slc == TRUE)
-		return;
-
-	switch (cond) {
-	case OFONO_EMULATOR_SLC_CONDITION_CMER:
-		if ((em->r_features & HFP_HF_FEATURE_3WAY) &&
-				(em->l_features & HFP_AG_FEATURE_3WAY))
-			return;
-		/* Fall Through */
-
-	case OFONO_EMULATOR_SLC_CONDITION_CHLD:
-		if ((em->r_features & HFP_HF_FEATURE_HF_INDICATORS) &&
-				(em->l_features & HFP_HF_FEATURE_HF_INDICATORS))
-			return;
-		/* Fall Through */
-
-	case OFONO_EMULATOR_SLC_CONDITION_BIND:
-		ofono_info("SLC reached");
-		em->slc = TRUE;
-
-	default:
-		break;
-	}
-}
-
-void ofono_emulator_set_hf_indicator_active(struct ofono_emulator *em,
-						int indicator,
-						ofono_bool_t active)
-{
-	char buf[64];
-
-	if (!(em->l_features & HFP_HF_FEATURE_HF_INDICATORS))
-		return;
-
-	if (!(em->r_features & HFP_HF_FEATURE_HF_INDICATORS))
-		return;
-
-	if (indicator != HFP_HF_INDICATOR_ENHANCED_SAFETY)
-		return;
-
-	em->ddr_active = active;
-
-	sprintf(buf, "+BIND: %d,%d", HFP_HF_INDICATOR_ENHANCED_SAFETY, active);
-	g_at_server_send_unsolicited(em->server, buf);
-}
--- a/ofono/src/gprs.c
+++ b/ofono/src/gprs.c
@@ -58,7 +58,6 @@
 #define MAX_CONTEXTS 256
 #define SUSPEND_TIMEOUT 8
 #define MAX_MMS_MTU 1280
-#define MAX_GPRS_MTU 1280

 /* 27.007 Section 7.29 */
 enum packet_bearer {
@@ -151,8 +150,6 @@ struct pri_context {

 static void gprs_netreg_update(struct ofono_gprs *gprs);
 static void gprs_deactivate_next(struct ofono_gprs *gprs);
-static void write_context_settings(struct ofono_gprs *gprs,
-						struct pri_context *context);

 static GSList *g_drivers = NULL;
 static GSList *g_context_drivers = NULL;
@@ -268,32 +265,6 @@ static gboolean gprs_proto_from_string(const char *str,
 	return FALSE;
 }

-static const char *gprs_auth_method_to_string(enum ofono_gprs_auth_method auth)
-{
-	switch (auth) {
-	case OFONO_GPRS_AUTH_METHOD_CHAP:
-		return "chap";
-	case OFONO_GPRS_AUTH_METHOD_PAP:
-		return "pap";
-	};
-
-	return NULL;
-}
-
-static gboolean gprs_auth_method_from_string(const char *str,
-					enum ofono_gprs_auth_method *auth)
-{
-	if (g_str_equal(str, "chap")) {
-		*auth = OFONO_GPRS_AUTH_METHOD_CHAP;
-		return TRUE;
-	} else if (g_str_equal(str, "pap")) {
-		*auth = OFONO_GPRS_AUTH_METHOD_PAP;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
 static unsigned int gprs_cid_alloc(struct ofono_gprs *gprs)
 {
 	return idmap_alloc(gprs->cid_map);
@@ -589,16 +560,13 @@ static void pri_context_signal_settings(struct pri_context *ctx,
 				context_settings_append_ipv6);
 }

-static gboolean pri_parse_proxy(struct pri_context *ctx, const char *proxy)
+static void pri_parse_proxy(struct pri_context *ctx, const char *proxy)
 {
 	char *scheme, *host, *port, *path;

-	if (proxy[0] == 0)
-		return FALSE;
-
 	scheme = g_strdup(proxy);
 	if (scheme == NULL)
-		return FALSE;
+		return;

 	host = strstr(scheme, "://");
 	if (host != NULL) {
@@ -611,7 +579,7 @@ static gboolean pri_parse_proxy(struct pri_context *ctx, const char *proxy)
 			ctx->proxy_port = 80;
 		else {
 			g_free(scheme);
-			return FALSE;
+			return;
 		}
 	} else {
 		host = scheme;
@@ -633,16 +601,10 @@ static gboolean pri_parse_proxy(struct pri_context *ctx, const char *proxy)
 		}
 	}

-	if (host[0] == 0) {
-		g_free(scheme);
-		return FALSE;
-	}
-
 	g_free(ctx->proxy_host);
 	ctx->proxy_host = g_strdup(host);

 	g_free(scheme);
-	return TRUE;
 }

 static void pri_ifupdown(const char *interface, ofono_bool_t active)
@@ -728,16 +690,11 @@ static void pri_setproxy(const char *interface, const char *proxy)
 {
 	struct rtentry rt;
 	struct sockaddr_in addr;
-	in_addr_t proxy_addr;
 	int sk;

 	if (interface == NULL)
 		return;

-	proxy_addr = inet_addr(proxy);
-	if (proxy_addr == INADDR_NONE)
-		return;
-
 	sk = socket(PF_INET, SOCK_DGRAM, 0);
 	if (sk < 0)
 		return;
@@ -748,7 +705,7 @@ static void pri_setproxy(const char *interface, const char *proxy)

 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
-	addr.sin_addr.s_addr = proxy_addr;
+	addr.sin_addr.s_addr = inet_addr(proxy);
 	memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));

 	memset(&addr, 0, sizeof(addr));
@@ -835,8 +792,7 @@ static void pri_update_mms_context_settings(struct pri_context *ctx)
 	if (ctx->message_proxy)
 		settings->ipv4->proxy = g_strdup(ctx->message_proxy);

-	if (!pri_parse_proxy(ctx, ctx->message_proxy))
-		pri_parse_proxy(ctx, ctx->message_center);
+	pri_parse_proxy(ctx, ctx->message_proxy);

 	DBG("proxy %s port %u", ctx->proxy_host, ctx->proxy_port);

@@ -848,193 +804,6 @@ static void pri_update_mms_context_settings(struct pri_context *ctx)
 	pri_limit_mtu(settings->interface, MAX_MMS_MTU);
 }

-static gboolean pri_str_changed(const char *val, const char *newval)
-{
-	return newval ? (strcmp(val, newval) != 0) : (val[0] != 0);
-}
-
-static gboolean pri_str_update(char *val, const char *newval,
-		const int maxlen)
-{
-	DBG("oldval: %s, newval: %s, mmaxlen: %d", val, newval, maxlen);
-
-	if (newval) {
-		if (strcmp(val, newval)) {
-			strncpy(val, newval, maxlen);
-			return TRUE;
-		}
-	} else {
-		if (val[0]) {
-			val[0] = 0;
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static void pri_str_signal_change(struct pri_context *ctx,
-					const char *name, const char *value)
-{
-	ofono_dbus_signal_property_changed(ofono_dbus_get_connection(),
-			ctx->path, OFONO_CONNECTION_CONTEXT_INTERFACE,
-					name, DBUS_TYPE_STRING, &value);
-}
-
-static void pri_reset_context_properties(struct pri_context *ctx,
-				const struct ofono_gprs_provision_data *ap)
-{
-	struct ofono_gprs *gprs = ctx->gprs;
-	gboolean changed = FALSE;
-
-	DBG("%s", ctx->path);
-
-	if (strcmp(ctx->context.apn, ap->apn)) {
-		changed = TRUE;
-		strcpy(ctx->context.apn, ap->apn);
-		pri_str_signal_change(ctx, "AccessPointName",
-				ctx->context.apn);
-	}
-	if (ap->name && pri_str_update(ctx->name, ap->name,
-				sizeof(ctx->name))) {
-		changed = TRUE;
-		pri_str_signal_change(ctx, "Name", ctx->name);
-	}
-
-	if (pri_str_update(ctx->context.username, ap->username,
-				sizeof(ctx->context.username))) {
-		changed = TRUE;
-		pri_str_signal_change(ctx, "Username", ctx->context.username);
-	}
-
-	if (pri_str_update(ctx->context.password, ap->password,
-				sizeof(ctx->context.password))) {
-		changed = TRUE;
-		pri_str_signal_change(ctx, "Password", ctx->context.password);
-	}
-
-	if (ctx->context.proto != ap->proto) {
-		ctx->context.proto = ap->proto;
-		changed = TRUE;
-		pri_str_signal_change(ctx, "Protocol",
-				gprs_proto_to_string(ctx->context.proto));
-	}
-
-	if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
-		if (pri_str_update(ctx->message_proxy, ap->message_proxy,
-				sizeof(ctx->message_proxy))) {
-			changed = TRUE;
-			pri_str_signal_change(ctx, "MessageProxy",
-						ctx->message_proxy);
-		}
-
-		if (pri_str_update(ctx->message_center, ap->message_center,
-				sizeof(ctx->message_center))) {
-			changed = TRUE;
-			pri_str_signal_change(ctx, "MessageCenter",
-						ctx->message_center);
-		}
-	}
-
-	if (gprs->settings && changed) {
-		write_context_settings(gprs, ctx);
-		storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings);
-	}
-}
-
-static gboolean ap_valid(const struct ofono_gprs_provision_data *ap)
-{
-	if (!ap->apn || strlen(ap->apn) > OFONO_GPRS_MAX_APN_LENGTH ||
-							!is_valid_apn(ap->apn))
-		return FALSE;
-
-	if (ap->username &&
-			strlen(ap->username) > OFONO_GPRS_MAX_USERNAME_LENGTH)
-		return FALSE;
-
-	if (ap->password &&
-			strlen(ap->password) > OFONO_GPRS_MAX_PASSWORD_LENGTH)
-		return FALSE;
-
-	if (ap->message_proxy &&
-			strlen(ap->message_proxy) > MAX_MESSAGE_PROXY_LENGTH)
-		return FALSE;
-
-	if (ap->message_center &&
-			strlen(ap->message_center) > MAX_MESSAGE_CENTER_LENGTH)
-		return FALSE;
-
-	return TRUE;
-}
-
-static gboolean pri_deactivation_required(struct pri_context *ctx,
-				const struct ofono_gprs_provision_data *ap)
-{
-	if (ctx->context.proto != ap->proto)
-		return TRUE;
-
-	if (strcmp(ctx->context.apn, ap->apn))
-		return TRUE;
-
-	if (pri_str_changed(ctx->context.username, ap->username))
-		return TRUE;
-
-	if (pri_str_changed(ctx->context.password, ap->password))
-		return TRUE;
-
-	if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
-		if (pri_str_changed(ctx->message_proxy, ap->message_proxy))
-			return TRUE;
-
-		if (pri_str_changed(ctx->message_center, ap->message_center))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static DBusMessage *pri_provision_context(DBusConnection *conn,
-					DBusMessage *msg, void *data)
-{
-	DBG("");
-	struct pri_context *ctx = data;
-	struct ofono_gprs *gprs = ctx->gprs;
-	struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
-	struct ofono_sim *sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);
-	struct ofono_gprs_provision_data *settings;
-	DBusMessage *reply = NULL;
-	int i, count = 0;
-
-	if (sim == NULL)
-		return __ofono_error_failed(msg);
-
-	if (__ofono_gprs_provision_get_settings(ofono_sim_get_mcc(sim),
-				ofono_sim_get_mnc(sim), ofono_sim_get_spn(sim),
-						 &settings, &count) == FALSE)
-		return __ofono_error_failed(msg);
-
-	for (i = 0; i < count; i++) {
-		const struct ofono_gprs_provision_data *ap = settings + i;
-		if (ap->type == ctx->type && ap_valid(ap)) {
-			if ((!ctx->active &&
-				!ctx->pending && !ctx->gprs->pending) ||
-					!pri_deactivation_required(ctx, ap)) {
-				/* Re-provision the context */
-				pri_reset_context_properties(ctx, ap);
-				reply =  dbus_message_new_method_return(msg);
-			} else {
-				/* Context should be inactive */
-				if (ctx->gprs->pending || ctx->pending)
-					reply = __ofono_error_busy(msg);
-			}
-			break;
-		}
-	}
-
-	__ofono_gprs_provision_free_settings(settings, count);
-
-	return reply ? reply : __ofono_error_not_available(msg);
-}
-
 static void append_context_properties(struct pri_context *ctx,
 					DBusMessageIter *dict)
 {
@@ -1066,10 +835,6 @@ static void append_context_properties(struct pri_context *ctx,
 	ofono_dbus_dict_append(dict, "Password", DBUS_TYPE_STRING,
 				&strvalue);

-	strvalue = gprs_auth_method_to_string(ctx->context.auth_method);
-	ofono_dbus_dict_append(dict, "AuthenticationMethod", DBUS_TYPE_STRING,
-				&strvalue);
-
 	if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
 		strvalue = ctx->message_proxy;
 		ofono_dbus_dict_append(dict, "MessageProxy",
@@ -1144,9 +909,6 @@ static void pri_activate_callback(const struct ofono_error *error, void *data)

 		pri_context_signal_settings(ctx, gc->settings->ipv4 != NULL,
 						gc->settings->ipv6 != NULL);
-
-		if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET)
-			pri_limit_mtu(gc->settings->interface, MAX_GPRS_MTU);
 	}

 	value = ctx->active;
@@ -1415,37 +1177,6 @@ static DBusMessage *pri_set_message_center(struct pri_context *ctx,
 	return NULL;
 }

-static DBusMessage *pri_set_auth_method(struct pri_context *ctx,
-					DBusConnection *conn,
-					DBusMessage *msg, const char *str)
-{
-	GKeyFile *settings = ctx->gprs->settings;
-	enum ofono_gprs_auth_method auth;
-
-	if (gprs_auth_method_from_string(str, &auth) == FALSE)
-		return __ofono_error_invalid_format(msg);
-
-	if (ctx->context.auth_method == auth)
-		return dbus_message_new_method_return(msg);
-
-	ctx->context.auth_method = auth;
-
-	if (settings) {
-		g_key_file_set_string(settings, ctx->key,
-					"AuthenticationMethod", str);
-		storage_sync(ctx->gprs->imsi, SETTINGS_STORE, settings);
-	}
-
-	g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID);
-
-	ofono_dbus_signal_property_changed(conn, ctx->path,
-					OFONO_CONNECTION_CONTEXT_INTERFACE,
-					"AuthenticationMethod",
-					DBUS_TYPE_STRING, &str);
-
-	return NULL;
-}
-
 static DBusMessage *pri_set_property(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
@@ -1556,13 +1287,6 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
 		dbus_message_iter_get_basic(&var, &str);

 		return pri_set_name(ctx, conn, msg, str);
-	} else if (!strcmp(property, "AuthenticationMethod")) {
-		if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
-			return __ofono_error_invalid_args(msg);
-
-		dbus_message_iter_get_basic(&var, &str);
-
-		return pri_set_auth_method(ctx, conn, msg, str);
 	}

 	if (ctx->type != OFONO_GPRS_CONTEXT_TYPE_MMS)
@@ -1594,8 +1318,6 @@ static const GDBusMethodTable context_methods[] = {
 	{ GDBUS_ASYNC_METHOD("SetProperty",
 			GDBUS_ARGS({ "property", "s" }, { "value", "v" }),
 			NULL, pri_set_property) },
-	{ GDBUS_METHOD("ProvisionContext", NULL, NULL,
-			pri_provision_context) },
 	{ }
 };

@@ -2050,8 +1772,6 @@ static DBusMessage *gprs_set_property(DBusConnection *conn,
 static void write_context_settings(struct ofono_gprs *gprs,
 					struct pri_context *context)
 {
-	const char *auth_method;
-
 	g_key_file_set_string(gprs->settings, context->key,
 				"Name", context->name);
 	g_key_file_set_string(gprs->settings, context->key,
@@ -2060,11 +1780,6 @@ static void write_context_settings(struct ofono_gprs *gprs,
 				"Username", context->context.username);
 	g_key_file_set_string(gprs->settings, context->key,
 				"Password", context->context.password);
-
-	auth_method = gprs_auth_method_to_string(context->context.auth_method);
-	g_key_file_set_string(gprs->settings, context->key,
-				"AuthenticationMethod", auth_method);
-
 	g_key_file_set_string(gprs->settings, context->key, "Type",
 				gprs_context_type_to_string(context->type));
 	g_key_file_set_string(gprs->settings, context->key, "Protocol",
@@ -2831,29 +2546,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_signal_change(struct ofono_gprs_context *gc,
-							unsigned int cid)
-{
-	GSList *l;
-	struct pri_context *ctx;
-
-	if (gc->gprs == NULL)
-		return;
-
-	for (l = gc->gprs->contexts; l; l = l->next) {
-		ctx = l->data;
-
-		if (ctx->context.cid != cid)
-			continue;
-
-		if (ctx->active == FALSE)
-			break;
-
-		pri_context_signal_settings(ctx, gc->settings->ipv4 != NULL,
-						gc->settings->ipv6 != NULL);
-	}
-}
-
 int ofono_gprs_driver_register(const struct ofono_gprs_driver *d)
 {
 	DBG("driver: %p, name: %s", d, d->name);
@@ -3034,13 +2726,11 @@ static gboolean load_context(struct ofono_gprs *gprs, const char *group)
 	char *apn = NULL;
 	char *msgproxy = NULL;
 	char *msgcenter = NULL;
-	char *authstr = NULL;
 	gboolean ret = FALSE;
 	gboolean legacy = FALSE;
 	struct pri_context *context;
 	enum ofono_gprs_context_type type;
 	enum ofono_gprs_proto proto;
-	enum ofono_gprs_auth_method auth;
 	unsigned int id;

 	if (sscanf(group, "context%d", &id) != 1) {
@@ -3085,14 +2775,6 @@ static gboolean load_context(struct ofono_gprs *gprs, const char *group)
 	if (password == NULL)
 		goto error;

-	authstr = g_key_file_get_string(gprs->settings, group,
-						"AuthenticationMethod", NULL);
-	if (authstr == NULL)
-		authstr = g_strdup("chap");
-
-	if (gprs_auth_method_from_string(authstr, &auth) == FALSE)
-		goto error;
-
 	if (strlen(password) > OFONO_GPRS_MAX_PASSWORD_LENGTH)
 		goto error;

@@ -3129,7 +2811,6 @@ static gboolean load_context(struct ofono_gprs *gprs, const char *group)
 	strcpy(context->context.password, password);
 	strcpy(context->context.apn, apn);
 	context->context.proto = proto;
-	context->context.auth_method = auth;

 	if (msgproxy != NULL)
 		strcpy(context->message_proxy, msgproxy);
@@ -3159,7 +2840,6 @@ error:
 	g_free(apn);
 	g_free(msgproxy);
 	g_free(msgcenter);
-	g_free(authstr);

 	return ret;
 }
@@ -3291,8 +2971,6 @@ static void provision_context(const struct ofono_gprs_provision_data *ap,
 	if (ap->password != NULL)
 		strcpy(context->context.password, ap->password);

-	context->context.auth_method = ap->auth_method;
-
 	strcpy(context->context.apn, ap->apn);
 	context->context.proto = ap->proto;

@@ -3456,8 +3134,3 @@ void *ofono_gprs_get_data(struct ofono_gprs *gprs)
 {
 	return gprs->driver_data;
 }
-
-struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs)
-{
-	return __ofono_atom_get_modem(gprs->atom);
-}
--- a/ofono/src/handsfree-audio.c
+++ b/ofono/src/handsfree-audio.c
@@ -72,10 +72,10 @@ static ofono_bool_t transparent_sco = FALSE;
 static uint16_t codec2setting(uint8_t codec)
 {
 	switch (codec) {
-	case HFP_CODEC_CVSD:
-		return BT_VOICE_CVSD_16BIT;
-	default:
-		return BT_VOICE_TRANSPARENT;
+		case HFP_CODEC_CVSD:
+			return BT_VOICE_CVSD_16BIT;
+		default:
+			return BT_VOICE_TRANSPARENT;
 	}
 }

--- a/ofono/src/handsfree.c
+++ b/ofono/src/handsfree.c
@@ -44,40 +44,25 @@

 static GSList *g_drivers = NULL;

-#define HANDSFREE_FLAG_CACHED 0x1
-
 struct ofono_handsfree {
 	ofono_bool_t nrec;
 	ofono_bool_t inband_ringing;
 	ofono_bool_t voice_recognition;
 	ofono_bool_t voice_recognition_pending;
-
-	ofono_bool_t ddr;
-	ofono_bool_t ddr_pending;
-	ofono_bool_t have_ddr;
-	ofono_bool_t ddr_active;
-
 	unsigned int ag_features;
-	unsigned int ag_chld_features;
 	unsigned char battchg;
-	GSList *subscriber_numbers;

 	const struct ofono_handsfree_driver *driver;
 	void *driver_data;
 	struct ofono_atom *atom;
 	DBusMessage *pending;
-	int flags;
 };

-static const char **ag_features_list(unsigned int features,
-					unsigned int chld_features)
+static const char **ag_features_list(unsigned int features)
 {
-	static const char *list[10];
+	static const char *list[33];
 	unsigned int i = 0;

-	if (features & HFP_AG_FEATURE_3WAY)
-		list[i++] = "three-way-calling";
-
 	if (features & HFP_AG_FEATURE_ECNR)
 		list[i++] = "echo-canceling-and-noise-reduction";

@@ -87,24 +72,6 @@ static const char **ag_features_list(unsigned int features,
 	if (features & HFP_AG_FEATURE_ATTACH_VOICE_TAG)
 		list[i++] = "attach-voice-tag";

-	if (chld_features & HFP_AG_CHLD_0)
-		list[i++] = "release-all-held";
-
-	if (chld_features & HFP_AG_CHLD_1x)
-		list[i++] = "release-specified-active-call";
-
-	if (chld_features & HFP_AG_CHLD_2x)
-		list[i++] = "private-chat";
-
-	if (chld_features & HFP_AG_CHLD_3)
-		list[i++] = "create-multiparty";
-
-	if (chld_features & HFP_AG_CHLD_4)
-		list[i++] = "transfer";
-
-	if (features & HFP_AG_FEATURE_HF_INDICATORS)
-		list[i++] = "hf-indicators";
-
 	list[i] = NULL;

 	return list;
@@ -158,15 +125,6 @@ void ofono_handsfree_set_ag_features(struct ofono_handsfree *hf,
 	hf->ag_features = ag_features;
 }

-void ofono_handsfree_set_ag_chld_features(struct ofono_handsfree *hf,
-					unsigned int ag_chld_features)
-{
-	if (hf == NULL)
-		return;
-
-	hf->ag_chld_features = ag_chld_features;
-}
-
 void ofono_handsfree_battchg_notify(struct ofono_handsfree *hf,
 					unsigned char level)
 {
@@ -190,44 +148,10 @@ void ofono_handsfree_battchg_notify(struct ofono_handsfree *hf,
 					&level);
 }

-static void append_subscriber_numbers(GSList *subscriber_numbers,
-						DBusMessageIter *iter)
-{
-	DBusMessageIter entry;
-	DBusMessageIter variant, array;
-	GSList *l;
-	const char *subscriber_number_string;
-	char arraysig[3];
-	const char *key = "SubscriberNumbers";
-
-	arraysig[0] = DBUS_TYPE_ARRAY;
-	arraysig[1] = DBUS_TYPE_STRING;
-	arraysig[2] = '\0';
-
-	dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY,
-					NULL, &entry);
-	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING,
-					&key);
-	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-					arraysig, &variant);
-	dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY,
-					DBUS_TYPE_STRING_AS_STRING, &array);
-
-	for (l = subscriber_numbers; l; l = l->next) {
-		subscriber_number_string = phone_number_to_string(l->data);
-		dbus_message_iter_append_basic(&array, DBUS_TYPE_STRING,
-						&subscriber_number_string);
-	}
-
-	dbus_message_iter_close_container(&variant, &array);
-
-	dbus_message_iter_close_container(&entry, &variant);
-	dbus_message_iter_close_container(iter, &entry);
-}
-
-static DBusMessage *generate_get_properties_reply(struct ofono_handsfree *hf,
-						DBusMessage *msg)
+static DBusMessage *handsfree_get_properties(DBusConnection *conn,
+						DBusMessage *msg, void *data)
 {
+	struct ofono_handsfree *hf = data;
 	DBusMessage *reply;
 	DBusMessageIter iter;
 	DBusMessageIter dict;
@@ -253,98 +177,22 @@ static DBusMessage *generate_get_properties_reply(struct ofono_handsfree *hf,
 		ofono_dbus_dict_append(&dict, "EchoCancelingNoiseReduction",
 						DBUS_TYPE_BOOLEAN, &hf->nrec);

-	if (hf->ag_features & HFP_AG_FEATURE_HF_INDICATORS)
-		ofono_dbus_dict_append(&dict, "DistractedDrivingReduction",
-						DBUS_TYPE_BOOLEAN, &hf->ddr);
-
 	voice_recognition = hf->voice_recognition;
 	ofono_dbus_dict_append(&dict, "VoiceRecognition", DBUS_TYPE_BOOLEAN,
 				&voice_recognition);

-	features = ag_features_list(hf->ag_features, hf->ag_chld_features);
+	features = ag_features_list(hf->ag_features);
 	ofono_dbus_dict_append_array(&dict, "Features", DBUS_TYPE_STRING,
 					&features);

 	ofono_dbus_dict_append(&dict, "BatteryChargeLevel", DBUS_TYPE_BYTE,
 				&hf->battchg);

-	if (hf->subscriber_numbers)
-		append_subscriber_numbers(hf->subscriber_numbers, &dict);
-
 	dbus_message_iter_close_container(&iter, &dict);

 	return reply;
 }

-static void hf_cnum_callback(const struct ofono_error *error, int total,
-				const struct ofono_phone_number *numbers,
-				void *data)
-{
-	struct ofono_handsfree *hf = data;
-	int num;
-	struct ofono_phone_number *subscriber_number;
-
-	if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
-		goto out;
-
-	for (num = 0; num < total; num++) {
-		subscriber_number = g_new0(struct ofono_phone_number, 1);
-
-		subscriber_number->type = numbers[num].type;
-		strncpy(subscriber_number->number, numbers[num].number,
-					OFONO_MAX_PHONE_NUMBER_LENGTH + 1);
-
-		hf->subscriber_numbers = g_slist_prepend(hf->subscriber_numbers,
-					subscriber_number);
-	}
-
-	hf->subscriber_numbers = g_slist_reverse(hf->subscriber_numbers);
-
-out:
-	hf->flags |= HANDSFREE_FLAG_CACHED;
-
-	if (hf->pending) {
-		DBusMessage *reply =
-			generate_get_properties_reply(hf, hf->pending);
-		__ofono_dbus_pending_reply(&hf->pending, reply);
-	}
-}
-
-static void query_cnum(struct ofono_handsfree *hf)
-{
-	DBusMessage *reply;
-
-	if (hf->driver->cnum_query != NULL) {
-		hf->driver->cnum_query(hf, hf_cnum_callback, hf);
-		return;
-	}
-
-	if (hf->pending == NULL)
-		return;
-
-	reply = generate_get_properties_reply(hf, hf->pending);
-	__ofono_dbus_pending_reply(&hf->pending, reply);
-}
-
-static DBusMessage *handsfree_get_properties(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ofono_handsfree *hf = data;
-
-	if (hf->pending != NULL)
-		return __ofono_error_busy(msg);
-
-	if (hf->flags & HANDSFREE_FLAG_CACHED)
-		return generate_get_properties_reply(hf, msg);
-
-	/* Query the settings and report back */
-	hf->pending = dbus_message_ref(msg);
-
-	query_cnum(hf);
-
-	return NULL;
-}
-
 static void voicerec_set_cb(const struct ofono_error *error, void *data)
 {
 	struct ofono_handsfree *hf = data;
@@ -369,82 +217,6 @@ static void voicerec_set_cb(const struct ofono_error *error, void *data)
 					&hf->voice_recognition);
 }

-static void ddr_set_cb(const struct ofono_error *error, void *data)
-{
-	struct ofono_handsfree *hf = data;
-	DBusConnection *conn = ofono_dbus_get_connection();
-	const char *path = __ofono_atom_get_path(hf->atom);
-
-	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
-		__ofono_dbus_pending_reply(&hf->pending,
-					__ofono_error_failed(hf->pending));
-		return;
-	}
-
-	hf->ddr = hf->ddr_pending;
-
-	__ofono_dbus_pending_reply(&hf->pending,
-				dbus_message_new_method_return(hf->pending));
-
-	ofono_dbus_signal_property_changed(conn, path,
-					OFONO_HANDSFREE_INTERFACE,
-					"DistractedDrivingReduction",
-					DBUS_TYPE_BOOLEAN,
-					&hf->voice_recognition);
-}
-
-void ofono_handsfree_set_hf_indicators(struct ofono_handsfree *hf,
-					const unsigned short *indicators,
-					unsigned int num)
-{
-	unsigned int i;
-
-	for (i = 0; i < num; i++) {
-		switch (indicators[i]) {
-		case HFP_HF_INDICATOR_ENHANCED_SAFETY:
-			hf->have_ddr = TRUE;
-			break;
-		}
-	}
-}
-
-static void ddr_update_cb(const struct ofono_error *error, void *data)
-{
-	if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
-		return;
-
-	ofono_info("Failed to update DDR indicator");
-}
-
-void ofono_handsfree_hf_indicator_active_notify(struct ofono_handsfree *hf,
-						unsigned int indicator,
-						ofono_bool_t active)
-{
-	DBG("%d, %d", indicator, active);
-
-	if (active)
-		active = TRUE;
-	else
-		active = FALSE;
-
-	switch (indicator) {
-	case HFP_HF_INDICATOR_ENHANCED_SAFETY:
-		if (!hf->have_ddr)
-			return;
-
-		if (hf->ddr_active == active)
-			return;
-
-		hf->ddr_active = active;
-
-		if (hf->ddr_active && hf->driver && hf->driver->hf_indicator)
-			hf->driver->hf_indicator(hf,
-					HFP_HF_INDICATOR_ENHANCED_SAFETY,
-					hf->ddr, ddr_update_cb, hf);
-		break;
-	}
-}
-
 static void nrec_set_cb(const struct ofono_error *error, void *data)
 {
 	struct ofono_handsfree *hf = data;
@@ -523,37 +295,6 @@ static DBusMessage *handsfree_set_property(DBusConnection *conn,

 		hf->pending = dbus_message_ref(msg);
 		hf->driver->disable_nrec(hf, nrec_set_cb, hf);
-	} else if (g_str_equal(name, "DistractedDrivingReduction") == TRUE) {
-		if (!(hf->ag_features & HFP_AG_FEATURE_HF_INDICATORS))
-			return __ofono_error_not_supported(msg);
-
-		if (!hf->driver->hf_indicator)
-			return __ofono_error_not_implemented(msg);
-
-		if (!hf->have_ddr)
-			return __ofono_error_not_supported(msg);
-
-		if (hf->ddr == enabled)
-			return dbus_message_new_method_return(msg);
-
-		if (!hf->ddr_active) {
-			hf->ddr = enabled;
-
-			g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID);
-
-			ofono_dbus_signal_property_changed(conn,
-					__ofono_atom_get_path(hf->atom),
-					OFONO_HANDSFREE_INTERFACE,
-					"DistractedDrivingReduction",
-					DBUS_TYPE_BOOLEAN,
-					&hf->voice_recognition);
-		} else {
-			hf->pending = dbus_message_ref(msg);
-			hf->ddr_pending = enabled;
-			hf->driver->hf_indicator(hf,
-					HFP_HF_INDICATOR_ENHANCED_SAFETY,
-					enabled, ddr_set_cb, hf);
-		}
 	} else
 		return __ofono_error_invalid_args(msg);

@@ -683,10 +424,6 @@ static void handsfree_unregister(struct ofono_atom *atom)
 		__ofono_dbus_pending_reply(&hf->pending, reply);
 	}

-	g_slist_foreach(hf->subscriber_numbers, (GFunc) g_free, NULL);
-	g_slist_free(hf->subscriber_numbers);
-	hf->subscriber_numbers = NULL;
-
 	ofono_modem_remove_interface(modem, OFONO_HANDSFREE_INTERFACE);
 	g_dbus_unregister_interface(conn, path,
 					OFONO_HANDSFREE_INTERFACE);
--- a/ofono/src/hfp.h
+++ b/ofono/src/hfp.h
@@ -31,7 +31,6 @@ enum hfp_ag_feature {
 	HFP_AG_FEATURE_ENHANCED_CALL_CONTROL =	0x80,
 	HFP_AG_FEATURE_EXTENDED_RES_CODE =	0x100,
 	HFP_AG_FEATURE_CODEC_NEGOTIATION =	0x200,
-	HFP_AG_FEATURE_HF_INDICATORS =		0x400,
 };

 /* HFP HF supported features bitmap. Bluetooth HFP 1.6 spec page 88 */
@@ -44,18 +43,6 @@ enum hfp_hf_feature {
 	HFP_HF_FEATURE_ENHANCED_CALL_STATUS =	0x20,
 	HFP_HF_FEATURE_ENHANCED_CALL_CONTROL =	0x40,
 	HFP_HF_FEATURE_CODEC_NEGOTIATION =	0x80,
-	HFP_HF_FEATURE_HF_INDICATORS =		0x100,
-};
-
-/* HFP AG supported call hold and multiparty services bitmap. Bluetooth HFP 1.6 spec page 76 */
-enum hfp_ag_chld_feature {
-	HFP_AG_CHLD_0 =		0x1,
-	HFP_AG_CHLD_1 =		0x2,
-	HFP_AG_CHLD_1x =	0x4,
-	HFP_AG_CHLD_2 =		0x8,
-	HFP_AG_CHLD_2x =	0x10,
-	HFP_AG_CHLD_3 =		0x20,
-	HFP_AG_CHLD_4 =		0x40,
 };

 enum hfp_sdp_hf_features {
@@ -85,10 +72,5 @@ enum hfp_codec {
 enum hfp_version {
 	HFP_VERSION_1_5 =	0x0105,
 	HFP_VERSION_1_6 =	0x0106,
-	HFP_VERSION_1_7 =	0x0107,
-	HFP_VERSION_LATEST =	HFP_VERSION_1_7,
-};
-
-enum hfp_hf_indicator {
-	HFP_HF_INDICATOR_ENHANCED_SAFETY =	0x0001,
+	HFP_VERSION_LATEST =	HFP_VERSION_1_6,
 };
--- a/ofono/src/idmap.c
+++ b/ofono/src/idmap.c
@@ -135,7 +135,7 @@ void idmap_put(struct idmap *idmap, unsigned int id)

 	id %= BITS_PER_LONG;

-	idmap->bits[offset] &= ~(1UL << id);
+	idmap->bits[offset] &= ~(1 << id);
 }

 unsigned int idmap_alloc(struct idmap *idmap)
@@ -149,7 +149,7 @@ unsigned int idmap_alloc(struct idmap *idmap)
 		return idmap->max + 1;

 	offset = bit / BITS_PER_LONG;
-	idmap->bits[offset] |= 1UL << (bit % BITS_PER_LONG);
+	idmap->bits[offset] |= 1 << (bit % BITS_PER_LONG);

 	return bit + idmap->min;
 }
@@ -163,7 +163,7 @@ void idmap_take(struct idmap *idmap, unsigned int id)
 		return;

 	offset = bit / BITS_PER_LONG;
-	idmap->bits[offset] |= 1UL << (bit % BITS_PER_LONG);
+	idmap->bits[offset] |= 1 << (bit % BITS_PER_LONG);
 }

 /*
@@ -186,7 +186,7 @@ unsigned int idmap_alloc_next(struct idmap *idmap, unsigned int last)
 		return idmap_alloc(idmap);

 	offset = bit / BITS_PER_LONG;
-	idmap->bits[offset] |= 1UL << (bit % BITS_PER_LONG);
+	idmap->bits[offset] |= 1 << (bit % BITS_PER_LONG);

 	return bit + idmap->min;
 }
--- a/ofono/src/main.c
+++ b/ofono/src/main.c
@@ -244,11 +244,7 @@ int main(int argc, char **argv)

 	__ofono_manager_init();

-	/*
-	 * BT HFP SCO socket creation moved to Bluez5 plugin.
-	 * Bluez4 handles the SCO socket, it will conflict with oFono.
-	 */
-	//__ofono_handsfree_audio_manager_init();
+	__ofono_handsfree_audio_manager_init();

 	__ofono_plugin_init(option_plugin, option_noplugin);

@@ -259,7 +255,7 @@ int main(int argc, char **argv)

 	__ofono_plugin_cleanup();

-	//__ofono_handsfree_audio_manager_cleanup(); See comment above
+	__ofono_handsfree_audio_manager_cleanup();

 	__ofono_manager_cleanup();

--- a/ofono/src/modem.c
+++ b/ofono/src/modem.c
@@ -414,9 +414,7 @@ static void flush_atoms(struct ofono_modem *modem, enum modem_state new_state)
 	while (cur) {
 		struct ofono_atom *atom = cur->data;

-		/* in case we are powering off the modem, flush everything */
-		if (atom->modem_state <= new_state &&
-			new_state > MODEM_STATE_POWER_OFF) {
+		if (atom->modem_state <= new_state) {
 			prev = cur;
 			cur = cur->next;
 			continue;
--- a/ofono/src/network.c
+++ b/ofono/src/network.c
@@ -934,40 +934,6 @@ static void append_operator_struct_list(struct ofono_netreg *netreg,
 	dbus_free_string_array(children);
 }

-static void network_signal_operators_changed(struct ofono_netreg *netreg)
-{
-	const char *path = __ofono_atom_get_path(netreg->atom);
-	DBusConnection *conn = ofono_dbus_get_connection();
-	DBusMessage *signal;
-	DBusMessageIter iter;
-	DBusMessageIter array;
-
-	signal = dbus_message_new_signal(path,
-		OFONO_NETWORK_REGISTRATION_INTERFACE, "OperatorsChanged");
-	if (signal == NULL) {
-		ofono_error("Unable to allocate new "
-					OFONO_NETWORK_REGISTRATION_INTERFACE
-					".OperatorsChanged signal");
-		return;
-	}
-
-	dbus_message_iter_init_append(signal, &iter);
-	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-					DBUS_STRUCT_BEGIN_CHAR_AS_STRING
-					DBUS_TYPE_OBJECT_PATH_AS_STRING
-					DBUS_TYPE_ARRAY_AS_STRING
-					DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
-					DBUS_TYPE_STRING_AS_STRING
-					DBUS_TYPE_VARIANT_AS_STRING
-					DBUS_DICT_ENTRY_END_CHAR_AS_STRING
-					DBUS_STRUCT_END_CHAR_AS_STRING,
-					&array);
-	append_operator_struct_list(netreg, &array);
-	dbus_message_iter_close_container(&iter, &array);
-
-	g_dbus_send_message(conn, signal);
-}
-
 static void operator_list_callback(const struct ofono_error *error, int total,
 				const struct ofono_network_operator *list,
 				void *data)
@@ -976,7 +942,6 @@ static void operator_list_callback(const struct ofono_error *error, int total,
 	DBusMessage *reply;
 	DBusMessageIter iter;
 	DBusMessageIter array;
-	gboolean changed;

 	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
 		DBG("Error occurred during operator list");
@@ -985,7 +950,7 @@ static void operator_list_callback(const struct ofono_error *error, int total,
 		return;
 	}

-	changed = update_operator_list(netreg, total, list);
+	update_operator_list(netreg, total, list);

 	reply = dbus_message_new_method_return(netreg->pending);

@@ -1005,11 +970,6 @@ static void operator_list_callback(const struct ofono_error *error, int total,
 	dbus_message_iter_close_container(&iter, &array);

 	__ofono_dbus_pending_reply(&netreg->pending, reply);
-
-	DBG("operator list %schanged", changed ? "" : "not ");
-
-	if (changed)
-		network_signal_operators_changed(netreg);
 }

 static DBusMessage *network_scan(DBusConnection *conn,
@@ -1081,8 +1041,6 @@ static const GDBusMethodTable network_registration_methods[] = {
 static const GDBusSignalTable network_registration_signals[] = {
 	{ GDBUS_SIGNAL("PropertyChanged",
 			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
-	{ GDBUS_SIGNAL("OperatorsChanged",
-			GDBUS_ARGS({ "operators", "a(oa{sv})"})) },
 	{ }
 };

--- a/ofono/src/ofono.h
+++ b/ofono/src/ofono.h
@@ -507,17 +507,8 @@ void __ofono_gprs_provision_free_settings(
 				int count);

 #include <ofono/emulator.h>
-
-enum ofono_emulator_slc_condition {
-	OFONO_EMULATOR_SLC_CONDITION_CMER,
-	OFONO_EMULATOR_SLC_CONDITION_CHLD,
-	OFONO_EMULATOR_SLC_CONDITION_BIND,
-};
-
 void __ofono_emulator_set_indicator_forced(struct ofono_emulator *em,
 						const char *name, int value);
-void __ofono_emulator_slc_condition(struct ofono_emulator *em,
-					enum ofono_emulator_slc_condition cond);

 #include <ofono/gnss.h>
 #include <ofono/cdma-sms.h>
--- a/ofono/src/radio-settings.c
+++ b/ofono/src/radio-settings.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <stdint.h>

 #include <glib.h>
 #include <gdbus.h>
@@ -49,7 +48,6 @@ struct ofono_radio_settings {
 	enum ofono_radio_band_gsm pending_band_gsm;
 	enum ofono_radio_band_umts pending_band_umts;
 	ofono_bool_t fast_dormancy_pending;
-	uint32_t available_rats;
 	const struct ofono_radio_settings_driver *driver;
 	void *driver_data;
 	struct ofono_atom *atom;
@@ -224,27 +222,6 @@ static DBusMessage *radio_get_properties_reply(DBusMessage *msg,
 					DBUS_TYPE_BOOLEAN, &value);
 	}

-	if (rs->available_rats) {
-		const char *rats[sizeof(uint32_t) * CHAR_BIT + 1];
-		const char **dbus_rats = rats;
-		int n = 0;
-		unsigned int i;
-
-		for (i = 0; i < sizeof(uint32_t) * CHAR_BIT; i++) {
-			int tech = 1 << i;
-
-			if (!(rs->available_rats & tech))
-				continue;
-
-			rats[n++] = radio_access_mode_to_string(tech);
-		}
-
-		rats[n] = NULL;
-
-		ofono_dbus_dict_append_array(&dict, "AvailableTechnologies",
-						DBUS_TYPE_STRING, &dbus_rats);
-	}
-
 	dbus_message_iter_close_container(&iter, &dict);

 	return reply;
@@ -397,32 +374,6 @@ static void radio_send_properties_reply(struct ofono_radio_settings *rs)
 	__ofono_dbus_pending_reply(&rs->pending, reply);
 }

-static void radio_available_rats_query_callback(const struct ofono_error *error,
-						unsigned int available_rats,
-						void *data)
-{
-	struct ofono_radio_settings *rs = data;
-
-	if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
-		rs->available_rats = available_rats & 0x7;
-	else
-		DBG("Error while querying available rats");
-
-	radio_send_properties_reply(rs);
-}
-
-static void radio_query_available_rats(struct ofono_radio_settings *rs)
-{
-	/* Modem technology is not supposed to change, so one query is enough */
-	if (rs->driver->query_available_rats == NULL || rs->available_rats) {
-		radio_send_properties_reply(rs);
-		return;
-	}
-
-	rs->driver->query_available_rats(
-				rs, radio_available_rats_query_callback, rs);
-}
-
 static void radio_fast_dormancy_query_callback(const struct ofono_error *error,
 						ofono_bool_t enable, void *data)
 {
@@ -439,13 +390,13 @@ static void radio_fast_dormancy_query_callback(const struct ofono_error *error,
 	}

 	radio_set_fast_dormancy(rs, enable);
-	radio_query_available_rats(rs);
+	radio_send_properties_reply(rs);
 }

 static void radio_query_fast_dormancy(struct ofono_radio_settings *rs)
 {
 	if (rs->driver->query_fast_dormancy == NULL) {
-		radio_query_available_rats(rs);
+		radio_send_properties_reply(rs);
 		return;
 	}

--- a/ofono/src/sim.c
+++ b/ofono/src/sim.c
@@ -267,12 +267,10 @@ static char **get_locked_pins(struct ofono_sim *sim)
 	return ret;
 }

-static void get_pin_retries(struct ofono_sim *sim, void ***out_dict,
-				unsigned char **out_retries)
+static void **get_pin_retries(struct ofono_sim *sim)
 {
 	int i, nelem;
-	void **dict;
-	unsigned char *retries;
+	void **ret;

 	for (i = 1, nelem = 0; i < OFONO_SIM_PASSWORD_INVALID; i++) {
 		if (sim->pin_retries[i] == -1)
@@ -281,22 +279,17 @@ static void get_pin_retries(struct ofono_sim *sim, void ***out_dict,
 		nelem += 1;
 	}

-	dict = g_new0(void *, nelem * 2 + 1);
-	retries = g_new0(unsigned char, nelem);
+	ret = g_new0(void *, nelem * 2 + 1);

 	for (i = 1, nelem = 0; i < OFONO_SIM_PASSWORD_INVALID; i++) {
 		if (sim->pin_retries[i] == -1)
 			continue;

-		retries[nelem] = sim->pin_retries[i];
-
-		dict[nelem * 2] = (void *) sim_passwd_name(i);
-		dict[nelem * 2 + 1] = &retries[nelem];
-		nelem += 1;
+		ret[nelem++] = (void *) sim_passwd_name(i);
+		ret[nelem++] = &sim->pin_retries[i];
 	}

-	*out_dict = dict;
-	*out_retries = retries;
+	return ret;
 }

 static char **get_service_numbers(GSList *service_numbers)
@@ -351,8 +344,7 @@ static DBusMessage *sim_get_properties(DBusConnection *conn,
 	char **service_numbers;
 	char **locked_pins;
 	const char *pin_name;
-	void **pin_retries_dict;
-	unsigned char *dbus_retries;
+	void **pin_retries;
 	dbus_bool_t present = sim->state != OFONO_SIM_STATE_NOT_PRESENT;
 	dbus_bool_t fdn;
 	dbus_bool_t bdn;
@@ -427,11 +419,10 @@ static DBusMessage *sim_get_properties(DBusConnection *conn,
 				DBUS_TYPE_STRING,
 				(void *) &pin_name);

-	get_pin_retries(sim, &pin_retries_dict, &dbus_retries);
+	pin_retries = get_pin_retries(sim);
 	ofono_dbus_dict_append_dict(&dict, "Retries", DBUS_TYPE_BYTE,
-							&pin_retries_dict);
-	g_free(pin_retries_dict);
-	g_free(dbus_retries);
+								&pin_retries);
+	g_free(pin_retries);

 done:
 	dbus_message_iter_close_container(&iter, &dict);
@@ -446,8 +437,7 @@ static void sim_pin_retries_query_cb(const struct ofono_error *error,
 	struct ofono_sim *sim = data;
 	DBusConnection *conn = ofono_dbus_get_connection();
 	const char *path = __ofono_atom_get_path(sim->atom);
-	void **pin_retries_dict;
-	unsigned char *dbus_retries;
+	void **pin_retries;

 	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
 		ofono_error("Querying remaining pin retries failed");
@@ -459,12 +449,11 @@ static void sim_pin_retries_query_cb(const struct ofono_error *error,

 	memcpy(sim->pin_retries, retries, sizeof(sim->pin_retries));

-	get_pin_retries(sim, &pin_retries_dict, &dbus_retries);
+	pin_retries = get_pin_retries(sim);
 	ofono_dbus_signal_dict_property_changed(conn, path,
 					OFONO_SIM_MANAGER_INTERFACE, "Retries",
-					DBUS_TYPE_BYTE,	&pin_retries_dict);
-	g_free(pin_retries_dict);
-	g_free(dbus_retries);
+					DBUS_TYPE_BYTE,	&pin_retries);
+	g_free(pin_retries);
 }

 static void sim_pin_retries_check(struct ofono_sim *sim)
--- a/ofono/src/smsutil.c
+++ b/ofono/src/smsutil.c
@@ -524,8 +524,7 @@ static gboolean encode_validity_period(const struct sms_validity_period *vp,
 gboolean sms_encode_address_field(const struct sms_address *in, gboolean sc,
 					unsigned char *pdu, int *offset)
 {
-	const char *addr = (const char *)&in->address;
-	size_t len = strlen(addr);
+	size_t len = strlen(in->address);
 	unsigned char addr_len = 0;
 	unsigned char p[10];

@@ -547,19 +546,13 @@ gboolean sms_encode_address_field(const struct sms_address *in, gboolean sc,
 		unsigned char *gsm;
 		unsigned char *r;

-		/* TP-OA's 10 octets transport 11 8-bit chars */
-		if (g_utf8_strlen(addr, strlen(addr)) > 11)
+		if (len > 11)
 			return FALSE;

 		gsm = convert_utf8_to_gsm(in->address, len, NULL, &written, 0);
 		if (gsm == NULL)
 			return FALSE;

-		if (written > 11) {
-			g_free(gsm);
-			return FALSE;
-		}
-
 		r = pack_7bit_own_buf(gsm, written, 0, FALSE, &packed, 0, p);

 		g_free(gsm);
@@ -682,11 +675,7 @@ gboolean sms_decode_address_field(const unsigned char *pdu, int len,
 		if (utf8 == NULL)
 			return FALSE;

-		/*
-		 * TP-OA's 10 octets transport 11 8-bit chars,
-		 * 22 bytes+terminator in UTF-8.
-		 */
-		if (strlen(utf8) > 22) {
+		if (strlen(utf8) > 20) {
 			g_free(utf8);
 			return FALSE;
 		}
@@ -3572,7 +3561,7 @@ GSList *sms_text_prepare_with_alphabet(const char *to, const char *utf8,
 	if (gsm_encoded == NULL) {
 		gsize converted;

-		ucs2_encoded = g_convert(utf8, -1, "UTF-16BE//TRANSLIT", "UTF-8",
+		ucs2_encoded = g_convert(utf8, -1, "UCS-2BE//TRANSLIT", "UTF-8",
 						NULL, &converted, NULL);
 		written = converted;
 	}
--- a/ofono/src/smsutil.h
+++ b/ofono/src/smsutil.h
@@ -220,11 +220,7 @@ enum cbs_geo_scope {
 struct sms_address {
 	enum sms_number_type number_type;
 	enum sms_numbering_plan numbering_plan;
-	/*
-	 * An alphanum TP-OA is 10 7-bit coded octets, which can carry
-	 * 11 8-bit characters. 22 bytes + terminator in UTF-8.
-	 */
-	char address[23];
+	char address[21]; /* Max 20 in semi-octet, 11 in alnum */
 };

 struct sms_scts {
--- a/ofono/src/voicecall.c
+++ b/ofono/src/voicecall.c
@@ -1502,19 +1502,6 @@ static void manager_dial_callback(const struct ofono_error *error, void *data)
 		if (is_emergency_number(vc, number) == TRUE)
 			__ofono_modem_dec_emergency_mode(modem);

-		if (vc->settings) {
-			/*Save the last dialled number for HFP AT+BLDN*/
-			if (number) {
-				g_key_file_set_string(vc->settings,
-							SETTINGS_GROUP,
-							"Number", number);
-
-				storage_sync(vc->imsi, SETTINGS_STORE,
-						vc->settings);
-			}
-
-		}
-
 		reply = __ofono_error_failed(vc->pending);
 	}

@@ -1558,6 +1545,12 @@ static int voicecall_dial(struct ofono_voicecall *vc, const char *number,

 	string_to_phone_number(number, &ph);

+	if (vc->settings) {
+		g_key_file_set_string(vc->settings, SETTINGS_GROUP,
+					"Number", number);
+		storage_sync(vc->imsi, SETTINGS_STORE, vc->settings);
+	}
+
 	vc->driver->dial(vc, &ph, clir, cb, vc);

 	return 0;
@@ -2324,19 +2317,6 @@ void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,
 		voicecall_emit_disconnect_reason(call, reason);

 	number = phone_number_to_string(&call->call->phone_number);
-
-	if (vc->settings) {
-		/*Save the last dialled number for HFP AT+BLDN*/
-		if (call->call->direction == CALL_DIRECTION_MOBILE_ORIGINATED
-					&& number) {
-			g_key_file_set_string(vc->settings, SETTINGS_GROUP,
-						"Number", number);
-
-			storage_sync(vc->imsi, SETTINGS_STORE, vc->settings);
-		}
-
-	}
-
 	if (is_emergency_number(vc, number) == TRUE)
 		__ofono_modem_dec_emergency_mode(modem);

@@ -2448,21 +2428,6 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 	return;

 error:
-	if (vc->settings) {
-
-		/*Save the last dialled number for HFP AT+BLDN*/
-		if (call->direction == CALL_DIRECTION_MOBILE_ORIGINATED
-					&& call->phone_number.number) {
-			const char *number =
-				phone_number_to_string(&call->phone_number);
-			g_key_file_set_string(vc->settings, SETTINGS_GROUP,
-						"Number", number);
-
-			storage_sync(vc->imsi, SETTINGS_STORE, vc->settings);
-		}
-
-	}
-
 	if (newcall)
 		g_free(newcall);

@@ -3431,10 +3396,6 @@ static void emulator_chld_cb(struct ofono_emulator *em,

 		ofono_emulator_send_info(em, buf, TRUE);
 		result.type = OFONO_ERROR_TYPE_NO_ERROR;
-
-		__ofono_emulator_slc_condition(em,
-					OFONO_EMULATOR_SLC_CONDITION_CHLD);
-
 		break;

 	case OFONO_EMULATOR_REQUEST_TYPE_QUERY:
--- a/ofono/test/activate-context
+++ b/ofono/test/activate-context
@@ -1,57 +1,40 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import sys
 import dbus

 bus = dbus.SystemBus()

-manager = dbus.Interface(bus.get_object('org.ofono', '/'), 'org.ofono.Manager')
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')

-if (len(sys.argv) == 3):
-	modem = sys.argv[1]
-	context_idx = int(sys.argv[2]) - 1
-else:
-	modem = None
-	modems = manager.GetModems()
-	for path, properties in modems:
-		if "org.ofono.ConnectionManager" in properties["Interfaces"]:
-			modem = path
-			break
-	if (modem is None):
-		exit(2)
-	if (len(sys.argv) == 1):
-		context_idx = 0
-	elif (len(sys.argv) == 2):
-		context_idx = int(sys.argv[1]) - 1
+modems = manager.GetModems()
+
+for path, properties in modems:
+	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
+		continue
+
+	connman = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.ConnectionManager')
+
+	contexts = connman.GetContexts()
+
+	if (len(contexts) == 0):
+		print "No context available"
+		sys.exit(1)
+
+	connman.SetProperty("Powered", dbus.Boolean(1))
+
+	if len(sys.argv) > 1:
+		path = contexts[int(sys.argv[1])][0]
 	else:
-		print("Usage: %s [modem] [context_number]" % (sys.argv[0]))
-		exit(1)
+		path = contexts[0][0]

-modemapi = dbus.Interface(bus.get_object('org.ofono', modem), 'org.ofono.Modem')
-properties = modemapi.GetProperties()
+	context = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.ConnectionContext')

-if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
-	print("org.ofono.ConnectionManager not found")
-	exit(2)
-
-connman = dbus.Interface(bus.get_object('org.ofono', modem),
-				'org.ofono.ConnectionManager')
-
-contexts = connman.GetContexts()
-
-if (len(contexts) == 0):
-	print("No context available")
-	exit(1)
-
-connman.SetProperty("Powered", dbus.Boolean(1))
-
-path = contexts[context_idx][0]
-
-context = dbus.Interface(bus.get_object('org.ofono', path),
-				'org.ofono.ConnectionContext')
-
-try:
-	context.SetProperty("Active", dbus.Boolean(1), timeout = 100)
-except dbus.DBusException as e:
-	print("Error activating %s: %s" % (path, str(e)))
-	exit(2)
+	try:
+		context.SetProperty("Active", dbus.Boolean(1), timeout = 100)
+	except dbus.DBusException, e:
+		print "Error activating %s: %s" % (path, str(e))
+		exit(2)
--- a/ofono/test/answer-calls
+++ b/ofono/test/answer-calls
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import dbus

@@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 modems = manager.GetModems()

 for path, properties in modems:
-	print("[ %s ]" % (path))
+	print "[ %s ]" % (path)

 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -22,7 +22,7 @@ for path, properties in modems:

 	for path, properties in calls:
 		state = properties["State"]
-		print("[ %s ] %s" % (path, state))
+		print "[ %s ] %s" % (path, state)

 		if state != "incoming":
 			continue
--- a/ofono/test/auto-answer-calls
+++ b/ofono/test/auto-answer-calls
@@ -1,6 +1,6 @@
-#!/usr/bin/python3
+#!/usr/bin/python

-from gi.repository import GLib
+import gobject

 import dbus
 import dbus.mainloop.glib
@@ -12,23 +12,23 @@ def answer_call(path):
 						'org.ofono.VoiceCall')
 	time.sleep(2)	
 	call.Answer()
-	print("    Voice Call [ %s ] Answered" % (path))
+	print "    Voice Call [ %s ] Answered" % (path)

 def voicecalls_call_added(path, properties):
-	print("    Voice Call [ %s ] Added" % (path))
+	print "    Voice Call [ %s ] Added" % (path)

 	for key in properties.keys():
 		val = str(properties[key])
-		print("        %s = %s" % (key, val))
-	print()
+		print "        %s = %s" % (key, val)
+	print

 	state = properties["State"]
 	if state == "incoming":
 		answer_call(path)

 def voicecalls_call_removed(path):
-	print("    Voice Call [ %s ] Removed" % (path))
-	print()
+	print "    Voice Call [ %s ] Removed" % (path)
+	print

 if __name__ == "__main__":
 	global vcmanager
@@ -43,7 +43,7 @@ if __name__ == "__main__":
 	modems = manager.GetModems()
 	modem = modems[0][0]

-	print("Using modem %s" % modem)
+	print "Using modem %s" % modem

 	vcmanager = dbus.Interface(bus.get_object('org.ofono', modem),
 						'org.ofono.VoiceCallManager')
@@ -52,6 +52,6 @@ if __name__ == "__main__":

 	vcmanager.connect_to_signal("CallRemoved", voicecalls_call_removed)

-	mainloop = GLib.MainLoop()
+	mainloop = gobject.MainLoop()
 	mainloop.run()

--- a/ofono/test/backtrace
+++ b/ofono/test/backtrace
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import os
 import re
@@ -6,7 +6,7 @@ import sys
 import subprocess

 if (len(sys.argv) < 3):
-	print("Usage: %s [binary] [log]" % (sys.argv[0]))
+	print "Usage: %s [binary] [log]" % (sys.argv[0])
 	sys.exit(1)

 binary = sys.argv[1]
@@ -50,8 +50,8 @@ child_stdout.close()
 frame_count = len(frames);

 count = 0
-print("-------- backtrace --------")
+print "-------- backtrace --------"
 while count < frame_count:
-	print("[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1]))
+	print "[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1])
 	count = count + 2
-print("---------------------------")
+print "---------------------------"
--- a/ofono/test/cancel-ussd
+++ b/ofono/test/cancel-ussd
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import sys
 import dbus
@@ -21,7 +21,7 @@ ussd = dbus.Interface(bus.get_object('org.ofono', path),
 properties = ussd.GetProperties()
 state = properties["State"]

-print("State: %s" % (state))
+print "State: %s" % (state)

 if state != "idle":
 	ussd.Cancel()
--- a/ofono/test/cdma-connman-disable
+++ b/ofono/test/cdma-connman-disable
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]

-print("Disconnecting CDMA Packet Data Service on modem %s..." % path)
+print "Disconnecting CDMA Packet Data Service on modem %s..." % path
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.cdma.ConnectionManager')

--- a/ofono/test/cdma-connman-enable
+++ b/ofono/test/cdma-connman-enable
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]

-print("Connecting CDMA Packet Data Service on modem %s..." % path)
+print "Connecting CDMA Packet Data Service on modem %s..." % path
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.cdma.ConnectionManager')

--- a/ofono/test/cdma-dial-number
+++ b/ofono/test/cdma-dial-number
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import sys
 import dbus
@@ -16,7 +16,7 @@ else:
 	path, properties = modems[0]
 	number = sys.argv[1]

-print("Using modem %s" % path)
+print "Using modem %s" % path

 manager = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.cdma.VoiceCallManager')
--- a/ofono/test/cdma-hangup
+++ b/ofono/test/cdma-hangup
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import sys
 import dbus
--- a/ofono/test/cdma-list-call
+++ b/ofono/test/cdma-list-call
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import dbus

@@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 modems = manager.GetModems()

 for path, properties in modems:
-	print("[ %s ]" % (path))
+	print "[ %s ]" % (path)

 	if "org.ofono.cdma.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -22,4 +22,4 @@ for path, properties in modems:

 	for key in properties.keys():
 		val = str(properties[key])
-		print("    %s = %s" % (key, val))
+		print "    %s = %s" % (key, val)
--- a/ofono/test/cdma-set-credentials
+++ b/ofono/test/cdma-set-credentials
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import dbus
 import sys
@@ -17,12 +17,12 @@ for path, properties in modems:
 	cm = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.cdma.ConnectionManager')

-	print("Connecting CDMA Packet Data Service on modem %s..." % path)
+	print "Connecting CDMA Packet Data Service on modem %s..." % path

 	if len(sys.argv) > 1:
 		cm.SetProperty("Username", (sys.argv[1]))
-		print("Setting Username to %s" % (sys.argv[1]))
+		print "Setting Username to %s" % (sys.argv[1])

 	if len(sys.argv) > 2:
 		cm.SetProperty("Password", (sys.argv[2]))
-		print("Setting Password to %s" % (sys.argv[2]))
+		print "Setting Password to %s" % (sys.argv[2])
--- a/ofono/test/change-pin
+++ b/ofono/test/change-pin
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import dbus
 import sys
@@ -19,10 +19,10 @@ elif len(sys.argv) == 3:
 	old_pin = sys.argv[2]
 	new_pin = sys.argv[3]
 else:
-	print("%s [PATH] pin_type old_pin new_pin" % (sys.argv[0]))
+	print "%s [PATH] pin_type old_pin new_pin" % (sys.argv[0])
 	sys.exit(0)

-print("Change %s for modem %s..." % (pin_type, path))
+print "Change %s for modem %s..." % (pin_type, path)

 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')
--- a/ofono/test/create-internet-context
+++ b/ofono/test/create-internet-context
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import sys
 import dbus
@@ -27,21 +27,21 @@ for path, properties in modems:

 	if path == "":
 		path = connman.AddContext("internet")
-		print("Created new context %s" % (path))
+		print "Created new context %s" % (path)
 	else:
-		print("Found context %s" % (path))
+		print "Found context %s" % (path)

 	context = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.ConnectionContext')

 	if len(sys.argv) > 1:
 		context.SetProperty("AccessPointName", sys.argv[1])
-		print("Setting APN to %s" % (sys.argv[1]))
+		print "Setting APN to %s" % (sys.argv[1])

 	if len(sys.argv) > 2:
 		context.SetProperty("Username", sys.argv[2])
-		print("Setting username to %s" % (sys.argv[2]))
+		print "Setting username to %s" % (sys.argv[2])

 	if len(sys.argv) > 3:
 		context.SetProperty("Password", sys.argv[3])
-		print("Setting password to %s" % (sys.argv[3]))
+		print "Setting password to %s" % (sys.argv[3])
--- a/ofono/test/create-mms-context
+++ b/ofono/test/create-mms-context
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python

 import sys
 import dbus
@@ -27,21 +27,21 @@ for path, properties in modems:

 	if path == "":
 		path = connman.AddContext("mms")
-		print("Created new context %s" % (path))
+		print "Created new context %s" % (path)
 	else:
-		print("Found context %s" % (path))
+		print "Found context %s" % (path)

 	context = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.ConnectionContext')

 	if len(sys.argv) > 1:
 		context.SetProperty("AccessPointName", sys.argv[1])
-		print("Setting APN to %s" % (sys.argv[1]))
+		print "Setting APN to %s" % (sys.argv[1])

 	if len(sys.argv) > 2:
 		context.SetProperty("Username", sys.argv[2])
-		print("Setting username to %s" % (sys.argv[2]))
+		print "Setting username to %s" % (sys.argv[2])

 	if len(sys.argv) > 3:
 		context.SetProperty("Password", sys.argv[3])
-		print("Setting password to %s" % (sys.argv[3]))
+		print "Setting password to %s" % (sys.argv[3])
--- a/Show More
+++ b/Show More