diff --git a/conf/distro/include/maintainers.inc b/conf/distro/include/maintainers.inc
index df8b647..870deae 100644
--- a/conf/distro/include/maintainers.inc
+++ b/conf/distro/include/maintainers.inc
@@ -483,7 +483,6 @@ RECIPE_MAINTAINER_pn-npth = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-nspr = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-nss = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-ocf-linux = "Ross Burton <ross.burton@intel.com>"
-RECIPE_MAINTAINER_pn-ofono = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-oh-puzzles = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-openjade = "Paul Eggleton <paul.eggleton@linux.intel.com>"
 RECIPE_MAINTAINER_pn-opensp = "Paul Eggleton <paul.eggleton@linux.intel.com>"
diff --git a/conf/distro/include/poky-floating-revisions.inc b/conf/distro/include/poky-floating-revisions.inc
index b11f2cd..4d21d9f 100644
--- a/conf/distro/include/poky-floating-revisions.inc
+++ b/conf/distro/include/poky-floating-revisions.inc
@@ -46,7 +46,6 @@ SRCREV_pn-clutter-cairo ?= "${AUTOREV}"
 SRCREV_pn-table ?= "${AUTOREV}"
 SRCREV_pn-libmatchbox ?= "${AUTOREV}"
 SRCREV_pn-tasks ?= "${AUTOREV}"
-SRCREV_pn-ofono ?= "${AUTOREV}"
 
 SRCREV_pn-dri2proto = "${AUTOREV}"
 #PREFERRED_VERSION_dri2proto ?= "1.99.1+git%"
diff --git a/conf/distro/netmodule-linux.conf b/conf/distro/netmodule-linux.conf
index 5fef267..102ab26 100644
--- a/conf/distro/netmodule-linux.conf
+++ b/conf/distro/netmodule-linux.conf
@@ -21,7 +21,7 @@ POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
 POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
 
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
-DISTRO_FEATURES_remove = "x11"
+DISTRO_FEATURES_remove = "x11 3g"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"