--- src/Makefile.in
+++ src/Makefile.in
@@ -14,7 +14,7 @@
 # Main portion: regular build rules
 
 GSRC = main.c gpm.c gpn.c mice.c special.c twiddler.c synaptics.c silitek.c \
-       startup.c server_tools.c
+       startup.c
 
 GOBJ = $(GSRC:.c=.o) report.o tools.o
 
--- src/gpn.c
+++ src/gpn.c
@@ -254,15 +254,12 @@
          case 'i': opt_time=atoi(optarg);                break;
          case 'k': check_kill();                         break;
          case 'l': opt_lut = optarg;                     break;
-         case 'm': add_mouse(GPM_ADD_DEVICE,optarg);     
-                   opt_dev = optarg;                     break; /* GO AWAY!*/
+         case 'm': opt_dev = optarg;                     break; /* GO AWAY!*/
          case 'M': opt_double++; option.repeater++;
             if (option.repeater_type == 0)
                option.repeater_type = "msc";
             which_mouse=mouse_table+2;                   break;
-         case 'o': add_mouse(GPM_ADD_OPTIONS,optarg);
-                   gpm_report(GPM_PR_DEBUG,"options: %s",optarg);
-                   opt_options = optarg;                 break; /* GO AWAY */
+         case 'o': opt_options = optarg;                 break; /* GO AWAY */
          case 'p': opt_ptrdrag = 0;                      break;
          case 'r':
             /* being called responsiveness, I must take the inverse */
@@ -276,8 +273,7 @@
          case 's': opt_sample = atoi(optarg);            break;
          case 'S': if (optarg) opt_special = optarg;
                    else opt_special="";                  break;
-         case 't': add_mouse(GPM_ADD_TYPE,optarg);
-                   opt_type = optarg;                    break; /* GO AWAY */
+         case 't': opt_type = optarg;                    break; /* GO AWAY */
          case 'u': option.autodetect = 1;                break;
          case 'T': opt_test++;                           break;
          case 'v': printf(GPM_MESS_VERSION "\n");        exit(0);
--- src/startup.c
+++ src/startup.c
@@ -158,7 +158,6 @@
 
    /****************** OLD CODE from gpn.c  END ***********************/
 
-   init_mice(option.micelist);                  /* reads option.micelist */
    atexit(gpm_exited);                          /* call gpm_exited at the end */
 
 }