diff --git a/pw3270.cbp b/pw3270.cbp
index bc4f4cb..6ada1e9 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -74,9 +74,6 @@
 		<Unit filename="src/objects/actions/dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/objects/actions/lib3270/action.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="src/objects/actions/lib3270/pakey.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -96,9 +93,6 @@
 		<Unit filename="src/objects/actions/simple.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/objects/actions/v3270/action.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="src/objects/actions/v3270/conditional.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/src/objects/actions/lib3270/toggle.c b/src/objects/actions/lib3270/toggle.c
index 8e14813..0480bca 100644
--- a/src/objects/actions/lib3270/toggle.c
+++ b/src/objects/actions/lib3270/toggle.c
@@ -125,7 +125,7 @@
 
  }
 
- GAction * pw3270_toggle_action_new_from_lib3270(const LIB3270_TOGGLE * definition) {
+ GAction * g_action_new_from_toggle(const LIB3270_TOGGLE * definition) {
 
  	Lib3270ToggleAction	* action = (Lib3270ToggleAction *) g_object_new(PW3270_TYPE_LIB3270_TOGGLE_ACTION, NULL);
 
diff --git a/src/objects/actions/private.h b/src/objects/actions/private.h
index 55703de..10d97f2 100644
--- a/src/objects/actions/private.h
+++ b/src/objects/actions/private.h
@@ -51,7 +51,7 @@
 	/* not really I18N-related, but also a string marker macro */
 	#define I_(string) g_intern_static_string (string)
 
-	G_GNUC_INTERNAL GAction	* pw3270_toggle_action_new_from_lib3270(const LIB3270_TOGGLE * definition);
+	G_GNUC_INTERNAL GAction	* g_action_new_from_toggle(const LIB3270_TOGGLE * definition);
 	G_GNUC_INTERNAL GAction * pw3270_action_new_pfkey(void);
 	G_GNUC_INTERNAL GAction * pw3270_action_new_pakey(void);
 
diff --git a/src/objects/actions/window.c b/src/objects/actions/window.c
index d827e06..588010e 100644
--- a/src/objects/actions/window.c
+++ b/src/objects/actions/window.c
@@ -60,12 +60,13 @@
 		const LIB3270_TOGGLE * toggles = lib3270_get_toggles();
 		for(ix = 0; toggles[ix].name; ix++) {
 
-			GAction *action = pw3270_toggle_action_new_from_lib3270(&toggles[ix]);
+			GAction *action = g_action_new_from_toggle(&toggles[ix]);
 			g_action_map_add_action(map,action);
 
 		}
 	}
 
+	/*
 	// Map V3270 actions
 	{
 		const V3270_ACTION * actions = v3270_get_actions();
@@ -76,6 +77,7 @@
 		}
 
 	}
+	*/
 
 	// Map special actions
 	{
diff --git a/src/objects/window/window.c b/src/objects/window/window.c
index 45d673c..92fdd33 100644
--- a/src/objects/window/window.c
+++ b/src/objects/window/window.c
@@ -167,7 +167,6 @@
 
 	}
 
-
 	//
 	// Setup toolbar
 	//
@@ -186,6 +185,32 @@
 
 	}
 
+/*
+#ifdef DEBUG
+
+	{
+		GAction *actions[] = {
+			g_action_map_lookup_action(G_ACTION_MAP(widget),"crosshair"),
+			g_action_map_lookup_action(G_ACTION_MAP(widget),"toolbar")
+		};
+
+		size_t ix;
+
+		for(ix = 0; ix < G_N_ELEMENTS(actions);ix++) {
+
+			debug("\n\nAction %u = %p",(unsigned int) ix, actions[ix]);
+
+			debug("Action: %s",g_action_get_name(actions[ix]));
+			debug("\tState-type:\t\t%s",g_action_get_state_type(actions[ix]));
+			debug("\tParameter-type:\t%s",g_action_get_parameter_type(actions[ix]));
+
+		}
+
+	}
+
+#endif // DEBUG
+*/
+
  }
 
  GtkWidget * pw3270_application_window_new(GtkApplication * application) {
--
libgit2 0.21.2