diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java
index 5addf84a8c3..fdc136c9ac6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java
@@ -580,20 +580,6 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements
 		enableStopAtMain.fillIntoGrid(group1, 3);
 		addField(enableStopAtMain);
 
-//		final StringFieldEditor stopAtMainSymbol = new StringFieldEditor(
-//				IGdbDebugPreferenceConstants.PREF_DEFAULT_STOP_AT_MAIN_SYMBOL,
-//				"",	group1); //$NON-NLS-1$
-//		stopAtMainSymbol.fillIntoGrid(group1, 2);
-//		addField(stopAtMainSymbol);
-//
-//		enableStopAtMain.getChangeControl(group1).addSelectionListener(new SelectionAdapter() {
-//			@Override
-//			public void widgetSelected(SelectionEvent e) {
-//				boolean enabled = enableStopAtMain.getBooleanValue();
-//				stopAtMainSymbol.setEnabled(enabled, group1);
-//			}
-//		});
-
 		fCommandTimeoutField = new IntegerWithBooleanFieldEditor( 
 				IGdbDebugPreferenceConstants.PREF_COMMAND_TIMEOUT, 
 				IGdbDebugPreferenceConstants.PREF_COMMAND_TIMEOUT_VALUE, 
@@ -659,33 +645,16 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements
 		// Need to set layout again.
 		group2.setLayout(groupLayout);
 
-		final ListenableBooleanFieldEditor enableGdbTracesField = new ListenableBooleanFieldEditor(
+		final IntegerWithBooleanFieldEditor enableGdbTracesField = new IntegerWithBooleanFieldEditor(
 				IGdbDebugPreferenceConstants.PREF_TRACES_ENABLE,
-				MessagesForPreferences.GdbDebugPreferencePage_enableTraces_label,
-				SWT.NONE, group2);
-
-		enableGdbTracesField.fillIntoGrid(group2, 3);
-		addField(enableGdbTracesField);
-
-		final IntegerFieldEditor maxCharactersField = new IntegerFieldEditor(
 				IGdbDebugPreferenceConstants.PREF_MAX_GDB_TRACES,
-				MessagesForPreferences.GdbDebugPreferencePage_maxGdbTraces_label,
+				MessagesForPreferences.GdbDebugPreferencePage_enableTraces_label,
 				group2);
 		// Instead of using Integer.MAX_VALUE which is some obscure number,
 		// using 2 billion is nice and readable.
-		maxCharactersField.setValidRange(10000, 2000000000);
-
-		maxCharactersField.fillIntoGrid(group2, 3);
-		addField(maxCharactersField);
-
-		enableGdbTracesField.getChangeControl(group2).addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				boolean enabled = enableGdbTracesField.getBooleanValue();
-				maxCharactersField.setEnabled(enabled, group2);
-			}
-		});
-
+		enableGdbTracesField.setValidRange(10000, 2000000000);
+		enableGdbTracesField.fillIntoGrid(group2, 2);
+		addField(enableGdbTracesField);
 		// Need to set layout again.
 		group2.setLayout(groupLayout);
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java
index 39f8c012e09..105a25caded 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java
@@ -29,8 +29,6 @@ class MessagesForPreferences extends NLS {
 	/** @since 2.3 */
 	public static String GdbDebugPreferencePage_general_behavior_label;
 	public static String GdbDebugPreferencePage_enableTraces_label;
-	/** @since 2.2 */
-	public static String GdbDebugPreferencePage_maxGdbTraces_label;
 	public static String GdbDebugPreferencePage_autoTerminateGdb_label;
 	public static String GdbDebugPreferencePage_Browse_button;
 	public static String GdbDebugPreferencePage_Command_column_name;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties
index b9d448bab57..9b22d8b9e9c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties
@@ -16,8 +16,7 @@ GdbDebugPreferencePage_Add_button=Add
 GdbDebugPreferencePage_description=General settings for GDB Debugging
 
 GdbDebugPreferencePage_general_behavior_label=General Behavior
-GdbDebugPreferencePage_enableTraces_label=Enable GDB traces
-GdbDebugPreferencePage_maxGdbTraces_label=Limit GDB traces output (number of characters):
+GdbDebugPreferencePage_enableTraces_label=Enable GDB traces with character limit:
 GdbDebugPreferencePage_autoTerminateGdb_label=Terminate GDB when last process exits
 GdbDebugPreferencePage_Command_column_name=GDB/MI Command
 GdbDebugPreferencePage_Command_field_can_not_be_empty='Command' field can not be empty