diff --git a/.gitignore b/.gitignore
index 259f252..ff8c632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,12 +59,15 @@ gschemas.compiled
 *.gschema.xml
 metainfo.xml
 *.metainfo.xml
-
 *.[0-9]
-
 *.3270
 macos/**/*.app
 mime.xml
 *.patch
 *.orig
 *.rej
+ABOUT-NLS
+intl
+m4
+po
+
diff --git a/src/objects/application/application.c b/src/objects/application/application.c
index 7115d4e..d34fc2c 100644
--- a/src/objects/application/application.c
+++ b/src/objects/application/application.c
@@ -240,9 +240,27 @@ static void pw3270Application_init(pw3270Application *app) {
 
 	static GOptionEntry cmd_options[] = {
 
-		{ "user-interface", 'U', 0, G_OPTION_ARG_CALLBACK,	&on_user_interface, N_( "Set the user-interface type" ),  NULL },
-		{ "logfile",		'l', 0, G_OPTION_ARG_CALLBACK,	&on_logfile, N_( "Set default log file name" ),  NULL },
-		{ NULL }
+		{
+			"user-interface",
+			'U',
+			0,
+			G_OPTION_ARG_CALLBACK,
+			&on_user_interface,
+			N_( "Set the user-interface type" ),
+			NULL
+		},
+		{
+			"logfile",
+			'l',
+			0,
+			G_OPTION_ARG_CALLBACK,
+			&on_logfile,
+			N_( "Set default log file name" ),
+			NULL
+		},
+		{
+			NULL
+		}
 
 	};
 
diff --git a/src/objects/application/open.c b/src/objects/application/open.c
index f999d54..69b0cd1 100644
--- a/src/objects/application/open.c
+++ b/src/objects/application/open.c
@@ -43,81 +43,6 @@ void pw3270_application_open(GApplication *application, GFile **files, gint n_fi
 		debug("%s(%d,%p)",__FUNCTION__,file,files[file]);
 		pw3270_application_open_file(GTK_APPLICATION(application),&window,files[file]);
 
-		/*
-
-		g_autofree gchar *path = g_file_get_path(files[file]);
-
-		if(!path) {
-
-			// It's not a session file descriptor, is it an URL?
-			g_autofree gchar * scheme = g_file_get_uri_scheme(files[file]);
-
-			if(!(g_ascii_strcasecmp(scheme,"tn3270") && g_ascii_strcasecmp(scheme,"tn3270s"))) {
-
-				// It's an URL, load it in the default session.
-
-				g_autofree gchar * uri = g_file_get_uri(files[file]);
-				size_t sz = strlen(uri);
-
-				if(sz > 0 && uri[sz-1] == '/')
-					uri[sz-1] = 0;
-
-				if(!(window && pw3270_application_allow_tabs(application))) {
-					debug("%s: Creating new window",__FUNCTION__);
-					window = pw3270_application_window_new(GTK_APPLICATION(application), NULL);
-				} else {
-					debug("%s: Creating new tab",__FUNCTION__);
-					window = pw3270_application_window_new_tab(window, NULL);
-				}
-
-				// Load default
-				GtkWidget * terminal = pw3270_application_window_get_active_terminal(window);
-
-				v3270_set_default_session(terminal);
-				v3270_set_url(terminal,uri);
-
-			}
-
-			continue;
-
-		}
-
-		if(g_file_test(path,G_FILE_TEST_IS_REGULAR)) {
-
-			// The file exists, use it.
-			debug("%s: Loading '%s'",__FUNCTION__,path);
-
-			if(!(window && pw3270_application_allow_tabs(application))) {
-				debug("%s: Creating new window",__FUNCTION__);
-				window = pw3270_application_window_new(GTK_APPLICATION(application), path);
-			} else {
-				debug("%s: Creating new tab",__FUNCTION__);
-				pw3270_application_window_new_tab(window,path);
-			}
-
-			continue;
-		}
-
-		{
-			g_autofree gchar * basename = g_file_get_basename(files[file]);
-			g_autofree gchar * filename = v3270_keyfile_find(basename);
-
-			if(filename) {
-
-				if(!window) {
-					debug("%s: Creating new window",__FUNCTION__);
-					window = pw3270_application_window_new(GTK_APPLICATION(application), filename);
-				} else {
-					debug("%s: Creating new tab",__FUNCTION__);
-					pw3270_application_window_new_tab(window, filename);
-				}
-
-				continue;
-			}
-
-		}
-
-		*/
 	}
 
 	if(window)
--
libgit2 0.21.2