diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index 3cee2c7d..e0214d1b 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -287,7 +287,6 @@ error:
 static void cops_list_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
-	//struct at_data *at = ofono_modem_userdata(cbd->modem);
 	ofono_operator_list_cb_t cb = cbd->cb;
 	struct ofono_network_operator *list;
 	GAtResultIter iter;
@@ -505,7 +504,6 @@ error:
 static void csq_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
-	//struct at_data *at = ofono_modem_userdata(modem);
 	int strength;
 	GAtResultIter iter;
 
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index 992fbe53..1bae9ca8 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -59,7 +59,6 @@ static void at_ussd_request(struct ofono_modem *modem, const char *str,
 	struct at_data *at = ofono_modem_userdata(modem);
 	struct cb_data *cbd = cb_data_new(modem, cb, data);
 	unsigned char *converted;
-	//struct ofono_error error;
 	int dcs;
 	int max_len;
 	long written;
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 1ac373b9..e5c8d49f 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -192,7 +192,6 @@ static GSList *parse_clcc(GAtResult *result)
 	GAtResultIter iter;
 	GSList *l = NULL;
 	int id, dir, status, type, number_type;
-	//const char *str;
 	struct ofono_call *call;
 
 	g_at_result_iter_init(&iter, result);
@@ -776,7 +775,6 @@ static void cring_notify(GAtResult *result, gpointer user_data)
 	const char *line;
 	int type;
 	struct ofono_call *call;
-	//GSList *l;
 
 	dump_response("cring_notify", TRUE, result);