--- a/main.cpp	Thu May 23 11:26:44 2019 -0400
+++ b/main.cpp	Thu May 23 12:36:26 2019 -0400
@@ -5,15 +5,11 @@
 #include "gui-main.h"
 #include "tty-main.h"
 
-namespace calc
-{
-  bool tty_mode = false;
-  bool debug_mode = false;
-}
-
 int
 main (int argc, char **argv)
 {
+  bool tty_mode = false;
+
   int new_argc = 0;
 
   char **new_argv = new char* [argc + 1];
@@ -23,19 +19,14 @@
   for (int i = 1; i < argc; i++)
     {
       if (argv[i] == std::string ("--tty"))
-        calc::tty_mode = true;
-      else
-        new_argv[new_argc++] = argv[i];
-
-      if (argv[i] == std::string ("--debug"))
-        calc::debug_mode = true;
+        tty_mode = true;
       else
         new_argv[new_argc++] = argv[i];
     }
 
-  int status = calc::tty_mode
-    ? tty::main (new_argc, new_argv)
-    : gui::main (new_argc, new_argv);
+  int status = tty_mode
+    ? calc::tty_main (new_argc, new_argv)
+    : calc::gui_main (new_argc, new_argv);
 
   delete [] new_argv;