diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c
index 4be7b02..b0cd903 100644
--- a/src/dialogs/colorscheme.c
+++ b/src/dialogs/colorscheme.c
@@ -417,7 +417,6 @@
 	}
 
 	g_message("Can't find color scheme");
-	//gtk_combo_box_set_active(GTK_COMBO_BOX(widget),-1);
 
 	// TODO: Create an entry for this scheme as "custom" and select it.
 
diff --git a/src/dialogs/font/chooser.c b/src/dialogs/font/chooser.c
index 6f8372d..b0a4823 100644
--- a/src/dialogs/font/chooser.c
+++ b/src/dialogs/font/chooser.c
@@ -204,8 +204,6 @@
 
 	if(chooser->font.face) {
 
-//		debug("%s",__FUNCTION__);
-
 		cairo_set_font_face(cr,chooser->font.face);
 		cairo_set_font_size(cr,15);
 
diff --git a/src/dialogs/load.c b/src/dialogs/load.c
index d38d70b..9a7a145 100644
--- a/src/dialogs/load.c
+++ b/src/dialogs/load.c
@@ -141,9 +141,6 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
  	// 0 - Filename xxxxxxxxx.xxxxxxxxx.xxxxxxxxx.xxxxxxxxx.xxxxxxxxx. x
  	// 1 - Charset  xxxxxxxxx.xxxxxxxxx.  Format: xxxxxxxxx.xxxxxxxxx.
 
-
-//	gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
-
 	// Setup visual elements
 	// https://developer.gnome.org/hig/stable/visual-layout.html.en
 	GtkWidget *widget;
@@ -171,13 +168,6 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 		gtk_grid_attach(grid,widget,0,0,1,1);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(widget),dialog->filename);
 
-		/*
-		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,"document-open");
-		gtk_entry_set_icon_activatable(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,TRUE);
-		gtk_entry_set_icon_tooltip_text(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,_("Select file"));
-		g_signal_connect(G_OBJECT(dialog->filename),"icon-press",G_CALLBACK(icon_press),dialog);
-		*/
-
 		g_signal_connect(dialog->filename,"changed",G_CALLBACK(filename_changed),dialog);
 
 		gtk_entry_bind_to_filechooser(
diff --git a/src/dialogs/print/draw.c b/src/dialogs/print/draw.c
index 5ef0c05..863689a 100644
--- a/src/dialogs/print/draw.c
+++ b/src/dialogs/print/draw.c
@@ -114,8 +114,6 @@
 		size_t col;
 		rect.x = operation->font.info.margin.left;
 
-//		debug("Drawing: %u row=%u selection=%p pos=%u", (unsigned int) drawing, row, selection, (unsigned int) pos);
-
 		for(col = 0; col < selection->bounds.width;col++)
 		{
 			if(selection->contents[pos].chr)
diff --git a/src/dialogs/print/print.c b/src/dialogs/print/print.c
index 74c6bf5..7557e5e 100644
--- a/src/dialogs/print/print.c
+++ b/src/dialogs/print/print.c
@@ -212,7 +212,7 @@
  	// Setup defaults
     widget->mode 					= LIB3270_CONTENT_ALL;
     widget->settings.show_selection	= FALSE;
-    widget->font.name				= NULL; // g_strdup(v3270_default_font);
+    widget->font.name				= NULL;
 
  }
 
diff --git a/src/dialogs/print/settings.c b/src/dialogs/print/settings.c
index 7ace2bd..8c8acff 100644
--- a/src/dialogs/print/settings.c
+++ b/src/dialogs/print/settings.c
@@ -91,9 +91,6 @@ static void V3270PrintSettings_init(V3270PrintSettings *widget)
  	gtk_grid_set_row_spacing(GTK_GRID(widget),6);
  	gtk_grid_set_column_spacing(GTK_GRID(widget),12);
 
-	// g_signal_connect(G_OBJECT(widget->color),"update-colors",G_CALLBACK(color_scheme_changed),widget);
-	// g_signal_connect(G_OBJECT(widget->selected),"toggled",G_CALLBACK(toggle_show_selection),widget);
-
 	for(f=0;f<G_N_ELEMENTS(text);f++)
 	{
 		GtkWidget *label = gtk_label_new_with_mnemonic(g_dgettext(GETTEXT_PACKAGE,text[f]));
diff --git a/src/terminal/keyboard/accelerator.c b/src/terminal/keyboard/accelerator.c
index 4f5f144..b3331ef 100644
--- a/src/terminal/keyboard/accelerator.c
+++ b/src/terminal/keyboard/accelerator.c
@@ -71,33 +71,11 @@
 
  gboolean v3270_accelerator_compare(const V3270Accelerator * accel, const guint keyval, const GdkModifierType mods)
  {
- 	// Problems:
-
-//	debug("%s: keys: %08x %08x",__FUNCTION__,accel->key,keyval);
-
-	// It's the same key?
-	if(accel->key != keyval)
-	{
-		g_autofree gchar * acckey = gtk_accelerator_name(accel->key,accel->mods);
-		g_autofree gchar * qkey = gtk_accelerator_name(keyval,mods);
-//		debug("%s: Rejected by key %08x %08x (%s %s)",__FUNCTION__,accel->key,keyval,acckey,qkey);
+	// It's the same key and mods?
+	if(accel->key != keyval || accel->mods != mods)
 		return FALSE;
-	}
 
 	// The same key and same mods, Found it!
- 	if(accel->mods == mods)
-		return TRUE;
-
-/*
-#ifdef DEBUG
-	{
-		g_autofree gchar * acckey = gtk_accelerator_name(accel->key,accel->mods);
-		g_autofree gchar * qkey = gtk_accelerator_name(keyval,mods);
-//		debug("%s: accel=%s (%0u/%08x) query=%s (%u/%08x) xor=%08x and=%08x",__FUNCTION__,acckey,accel->key,accel->mods,qkey,keyval,mods,(accel->mods^mods),(accel->mods & mods));
-	}
-#endif // DEBUG
-*/
-
 	return TRUE;
  }
 
--
libgit2 0.21.2