diff --git a/panels/network/cc-wifi-hotspot-dialog.c b/panels/network/cc-wifi-hotspot-dialog.c
index 6c5e1fd23..0ef536264 100644
--- a/panels/network/cc-wifi-hotspot-dialog.c
+++ b/panels/network/cc-wifi-hotspot-dialog.c
@@ -363,7 +363,7 @@ cc_wifi_hotspot_dialog_finalize (GObject *object)
 {
   CcWifiHotspotDialog *self = (CcWifiHotspotDialog *)object;
 
-  g_free (self->host_name);
+  g_clear_pointer (&self->host_name, g_free);
   g_clear_object (&self->device);
   g_clear_object (&self->connection);
 
@@ -474,7 +474,7 @@ cc_wifi_hotspot_dialog_set_hostname (CcWifiHotspotDialog *self,
 {
   g_return_if_fail (CC_IS_WIFI_HOTSPOT_DIALOG (self));
 
-  g_free (self->host_name);
+  g_clear_pointer (&self->host_name, g_free);
   self->host_name = g_strdup (host_name);
 }
 
diff --git a/panels/network/connection-editor/ce-page.c b/panels/network/connection-editor/ce-page.c
index 45d9abcab..aa081b481 100644
--- a/panels/network/connection-editor/ce-page.c
+++ b/panels/network/connection-editor/ce-page.c
@@ -78,11 +78,9 @@ finalize (GObject *object)
 {
         CEPage *self = CE_PAGE (object);
 
-        g_free (self->title);
-        if (self->cancellable) {
-                g_cancellable_cancel (self->cancellable);
-                g_object_unref (self->cancellable);
-        }
+        g_clear_pointer (&self->title, g_free);
+        g_cancellable_cancel (self->cancellable);
+        g_clear_object (&self->cancellable);
 
         G_OBJECT_CLASS (ce_page_parent_class)->finalize (object);
 }
@@ -150,8 +148,7 @@ set_property (GObject      *object,
 
         switch (prop_id) {
         case PROP_CONNECTION:
-                if (self->connection)
-                        g_object_unref (self->connection);
+                g_clear_object (&self->connection);
                 self->connection = g_value_dup_object (value);
                 break;
         default:
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
index 162659c73..70a607f6f 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -420,20 +420,17 @@ get_secrets_cb (GObject *source_object,
                 gpointer user_data)
 {
         NMRemoteConnection *connection;
-        GetSecretsInfo *info = user_data;
+        g_autofree GetSecretsInfo *info = user_data;
         g_autoptr(GError) error = NULL;
         g_autoptr(GVariant) variant = NULL;
 
         connection = NM_REMOTE_CONNECTION (source_object);
         variant = nm_remote_connection_get_secrets_finish (connection, res, &error);
 
-        if (!variant && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-                g_free (info);
+        if (!variant && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
                 return;
-        }
 
         ce_page_complete_init (info->page, info->setting_name, variant, g_steal_pointer (&error));
-        g_free (info);
 }
 
 static void
diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c
index 5762e533f..a7c7216eb 100644
--- a/panels/network/net-device-ethernet.c
+++ b/panels/network/net-device-ethernet.c
@@ -551,7 +551,7 @@ device_ethernet_finalize (GObject *object)
 {
         NetDeviceEthernet *self = NET_DEVICE_ETHERNET (object);
 
-        g_object_unref (self->builder);
+        g_clear_object (&self->builder);
         g_hash_table_destroy (self->connections);
 
         G_OBJECT_CLASS (net_device_ethernet_parent_class)->finalize (object);
diff --git a/panels/network/net-device-simple.c b/panels/network/net-device-simple.c
index bc4c0b451..451481400 100644
--- a/panels/network/net-device-simple.c
+++ b/panels/network/net-device-simple.c
@@ -197,7 +197,7 @@ net_device_simple_finalize (GObject *object)
         NetDeviceSimple *self = NET_DEVICE_SIMPLE (object);
         NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self);
 
-        g_object_unref (priv->builder);
+        g_clear_object (&priv->builder);
 
         G_OBJECT_CLASS (net_device_simple_parent_class)->finalize (object);
 }
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 1cf65dc59..49bec8587 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -970,16 +970,14 @@ net_device_wifi_finalize (GObject *object)
 {
         NetDeviceWifi *self = NET_DEVICE_WIFI (object);
 
-        if (self->cancellable) {
-                g_cancellable_cancel (self->cancellable);
-                g_clear_object (&self->cancellable);
-        }
+        g_cancellable_cancel (self->cancellable);
+        g_clear_object (&self->cancellable);
         disable_scan_timeout (self);
 
-        g_object_unref (self->builder);
-        g_free (self->selected_ssid_title);
-        g_free (self->selected_connection_id);
-        g_free (self->selected_ap_id);
+        g_clear_object (&self->builder);
+        g_clear_pointer (&self->selected_ssid_title, g_free);
+        g_clear_pointer (&self->selected_connection_id, g_free);
+        g_clear_pointer (&self->selected_ap_id, g_free);
 
         G_OBJECT_CLASS (net_device_wifi_parent_class)->finalize (object);
 }
diff --git a/panels/network/net-object.c b/panels/network/net-object.c
index 137e600f0..c67cafc72 100644
--- a/panels/network/net-object.c
+++ b/panels/network/net-object.c
@@ -252,8 +252,8 @@ net_object_finalize (GObject *object)
         NetObject *self = NET_OBJECT (object);
         NetObjectPrivate *priv = net_object_get_instance_private (self);
 
-        g_free (priv->id);
-        g_free (priv->title);
+        g_clear_pointer (&priv->id, g_free);
+        g_clear_pointer (&priv->title, g_free);
         g_clear_object (&priv->cancellable);
 
         if (priv->client)
diff --git a/panels/network/net-vpn.c b/panels/network/net-vpn.c
index 6717d49f3..91232827e 100644
--- a/panels/network/net-vpn.c
+++ b/panels/network/net-vpn.c
@@ -334,22 +334,18 @@ net_vpn_finalize (GObject *object)
         NetVpn *self = NET_VPN (object);
         NMClient *client = net_object_get_client (NET_OBJECT (object));
 
-        if (client) {
+        if (client)
                 g_signal_handlers_disconnect_by_func (client,
                                                       nm_active_connections_changed,
                                                       self);
-        }
-
-        if (self->active_connection) {
+        if (self->active_connection)
                 g_signal_handlers_disconnect_by_func (self->active_connection,
                                                       nm_device_refresh_vpn_ui,
                                                       self);
-                g_object_unref (self->active_connection);
-        }
-
-        g_object_unref (self->connection);
-        g_free (self->service_type);
 
+        g_clear_object (&self->active_connection);
+        g_clear_object (&self->connection);
+        g_clear_pointer (&self->service_type, g_free);
         g_clear_object (&self->builder);
 
         G_OBJECT_CLASS (net_vpn_parent_class)->finalize (object);
diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
index c17e84991..41ceec5e5 100644
--- a/panels/network/network-dialogs.c
+++ b/panels/network/network-dialogs.c
@@ -40,8 +40,8 @@ wireless_dialog_closure_closure_notify (gpointer data,
                                         GClosure *gclosure)
 {
         WirelessDialogClosure *closure = data;
-        g_object_unref (closure->client);
 
+        g_clear_object (&closure->client);
         g_slice_free (WirelessDialogClosure, data);
 }
 
@@ -49,9 +49,9 @@ static void
 mobile_dialog_closure_free (gpointer data)
 {
         MobileDialogClosure *closure = data;
-        g_object_unref (closure->client);
-        g_object_unref (closure->device);
 
+        g_clear_object (&closure->client);
+        g_clear_object (&closure->device);
         g_slice_free (MobileDialogClosure, data);
 }
 
diff --git a/panels/network/wireless-security/eap-method-fast.c b/panels/network/wireless-security/eap-method-fast.c
index 6cbbc1485..858c049cb 100644
--- a/panels/network/wireless-security/eap-method-fast.c
+++ b/panels/network/wireless-security/eap-method-fast.c
@@ -56,8 +56,7 @@ destroy (EAPMethod *parent)
 {
 	EAPMethodFAST *self = (EAPMethodFAST *) parent;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 }
 
 static gboolean
@@ -96,8 +95,7 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
 	GtkTreeIter iter;
 	g_autoptr(EAPMethod) eap = NULL;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 	self->size_group = g_object_ref (group);
 
 	gtk_size_group_add_widget (group, GTK_WIDGET (self->anon_identity_label));
diff --git a/panels/network/wireless-security/eap-method-peap.c b/panels/network/wireless-security/eap-method-peap.c
index 125075a41..a70aaccce 100644
--- a/panels/network/wireless-security/eap-method-peap.c
+++ b/panels/network/wireless-security/eap-method-peap.c
@@ -56,8 +56,7 @@ destroy (EAPMethod *parent)
 {
 	EAPMethodPEAP *self = (EAPMethodPEAP *) parent;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 }
 
 static gboolean
@@ -105,8 +104,7 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
 	GtkTreeIter iter;
 	g_autoptr(EAPMethod) eap = NULL;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 	self->size_group = g_object_ref (group);
 
 	gtk_size_group_add_widget (group, GTK_WIDGET (self->ca_cert_not_required_check));
diff --git a/panels/network/wireless-security/eap-method-ttls.c b/panels/network/wireless-security/eap-method-ttls.c
index e013dd96c..c474f7795 100644
--- a/panels/network/wireless-security/eap-method-ttls.c
+++ b/panels/network/wireless-security/eap-method-ttls.c
@@ -56,8 +56,7 @@ destroy (EAPMethod *parent)
 {
 	EAPMethodTTLS *self = (EAPMethodTTLS *) parent;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 }
 
 static gboolean
@@ -105,8 +104,7 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
 	GtkTreeIter iter;
 	g_autoptr(EAPMethod) eap = NULL;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 	self->size_group = g_object_ref (group);
 
 	gtk_size_group_add_widget (group, GTK_WIDGET (self->ca_cert_not_required_check));
diff --git a/panels/network/wireless-security/eap-method.c b/panels/network/wireless-security/eap-method.c
index 76c853b3d..2030e954a 100644
--- a/panels/network/wireless-security/eap-method.c
+++ b/panels/network/wireless-security/eap-method.c
@@ -200,10 +200,8 @@ eap_method_unref (EAPMethod *self)
 		if (self->destroy)
 			self->destroy (self);
 
-		if (self->builder)
-			g_object_unref (self->builder);
-		if (self->ui_widget)
-			g_object_unref (self->ui_widget);
+		g_clear_object (&self->builder);
+		g_clear_object (&self->ui_widget);
 
 		g_slice_free1 (self->obj_size, self);
 	}
diff --git a/panels/network/wireless-security/wireless-security.c b/panels/network/wireless-security/wireless-security.c
index b07142b93..d671c278b 100644
--- a/panels/network/wireless-security/wireless-security.c
+++ b/panels/network/wireless-security/wireless-security.c
@@ -160,14 +160,13 @@ wireless_security_unref (WirelessSecurity *self)
 		if (priv->destroy)
 			priv->destroy (self);
 
-		g_free (priv->username);
-		if (priv->password) {
+		if (priv->password)
 			memset (priv->password, 0, strlen (priv->password));
-			g_free (priv->password);
-		}
 
-		if (self->builder)
-			g_object_unref (self->builder);
+		g_clear_pointer (&priv->username, g_free);
+		g_clear_pointer (&priv->password, g_free);
+
+		g_clear_object (&self->builder);
 		g_slice_free1 (priv->obj_size, self);
 		g_free (priv);
 	}
@@ -306,13 +305,13 @@ wireless_security_set_userpass (WirelessSecurity *self,
 {
 	WirelessSecurityPrivate *priv = self->priv;
 
-	g_free (priv->username);
+	g_clear_pointer (&priv->username, g_free);
 	priv->username = g_strdup (user);
 
-	if (priv->password) {
+	if (priv->password)
 		memset (priv->password, 0, strlen (priv->password));
-		g_free (priv->password);
-	}
+
+	g_clear_pointer (&priv->password, g_free);
 	priv->password = g_strdup (password);
 
 	if (always_ask != (gboolean) -1)
diff --git a/panels/network/wireless-security/ws-dynamic-wep.c b/panels/network/wireless-security/ws-dynamic-wep.c
index 9252e09e6..46fa9eda1 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.c
+++ b/panels/network/wireless-security/ws-dynamic-wep.c
@@ -45,8 +45,7 @@ destroy (WirelessSecurity *parent)
 {
 	WirelessSecurityDynamicWEP *self = (WirelessSecurityDynamicWEP *) parent;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 }
 
 static GtkWidget *
@@ -68,8 +67,7 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
 {
 	WirelessSecurityDynamicWEP *self = (WirelessSecurityDynamicWEP *) parent;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 	self->size_group = g_object_ref (group);
 
 	ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo);
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index ee1a38181..02c5eb26b 100644
--- a/panels/network/wireless-security/ws-wpa-eap.c
+++ b/panels/network/wireless-security/ws-wpa-eap.c
@@ -46,8 +46,7 @@ destroy (WirelessSecurity *parent)
 {
 	WirelessSecurityWPAEAP *self = (WirelessSecurityWPAEAP *) parent;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 }
 
 static GtkWidget *
@@ -69,8 +68,7 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
 {
 	WirelessSecurityWPAEAP *self = (WirelessSecurityWPAEAP *) parent;
 
-	if (self->size_group)
-		g_object_unref (self->size_group);
+	g_clear_object (&self->size_group);
 	self->size_group = g_object_ref (group);
 
 	ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo);