diff --git a/include/minix/com.h b/include/minix/com.h
index 46eaacc2f..545504e25 100755
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -37,7 +37,6 @@
 #define IS_PROC_NR	 5 	/* information server */
 #define TTY		 6	/* terminal (TTY) driver */
 #define MEMORY	 	 8  	/* memory driver (RAM disk, null, etc.) */
-#define SM_PROC_NR	 3 	/* system management server */
 #define AT_WINI		(MEMORY + ENABLE_AT_WINI)   /* AT Winchester */
 #define FLOPPY		(AT_WINI + ENABLE_FLOPPY)   /* floppy disk */
 #define PRINTER		(FLOPPY + ENABLE_PRINTER)    /* Centronics */
@@ -47,7 +46,7 @@
 
 /* Number of processes contained in the system image. */
 #define IMAGE_SIZE 	(NR_TASKS + \
-			6 + ENABLE_AT_WINI + ENABLE_FLOPPY + \
+			5 + ENABLE_AT_WINI + ENABLE_FLOPPY + \
 			ENABLE_PRINTER + ENABLE_RTL8139 + ENABLE_FXP + 1 )	
 
 
diff --git a/kernel/table.c b/kernel/table.c
index 3f03c7701..dc6e4c96b 100755
--- a/kernel/table.c
+++ b/kernel/table.c
@@ -67,7 +67,6 @@ PUBLIC struct system_image image[] = {
  { HARDWARE, 0,            0,   TASK_Q, HARDWARE_STACK, EMPTY_CALL_MASK, ALLOW_ALL_MASK,"HARDW." },
  { PM_PROC_NR, 0,            0, 3, 0,          SYSTEM_CALL_MASK,   ALLOW_ALL_MASK,      "PM"      },
  { FS_PROC_NR, 0,            0, 3, 0,          SYSTEM_CALL_MASK,   ALLOW_ALL_MASK,      "FS"      },
- { SM_PROC_NR, 0,            0, 2, 0,           SYSTEM_CALL_MASK,  ALLOW_ALL_MASK,      "SM"      },
  { IS_PROC_NR, 0,            0, 2, 0,           SYSTEM_CALL_MASK,  ALLOW_ALL_MASK,      "IS"      },
  { TTY, 0,            0, 1, 0,            SYSTEM_CALL_MASK, ALLOW_ALL_MASK,      "TTY"      },
  { MEMORY, 0,            0, 2, 0,           SYSTEM_CALL_MASK,  ALLOW_ALL_MASK,     "MEMORY" },
diff --git a/servers/pm/main.c b/servers/pm/main.c
index 90bf4aa6a..fd40d7697 100644
--- a/servers/pm/main.c
+++ b/servers/pm/main.c
@@ -213,17 +213,11 @@ PRIVATE void pm_init()
   mproc[INIT_PROC_NR].mp_parent = PM_PROC_NR;
   sigemptyset(&mproc[INIT_PROC_NR].mp_ignore);
   sigemptyset(&mproc[INIT_PROC_NR].mp_sigmask);
-  sigemptyset(&mproc[INIT_PROC_NR].mp_catch);
 
   mproc[PM_PROC_NR].mp_pid = PM_PID;
   mproc[PM_PROC_NR].mp_parent = PM_PARENT;
   sigfillset(&mproc[PM_PROC_NR].mp_ignore);
   sigfillset(&mproc[PM_PROC_NR].mp_sigmask);
-  sigemptyset(&mproc[PM_PROC_NR].mp_catch);
-
-  sigfillset(&mproc[FS_PROC_NR].mp_ignore);
-  sigfillset(&mproc[FS_PROC_NR].mp_sigmask);
-  sigemptyset(&mproc[FS_PROC_NR].mp_catch);
 
   /* Tell FS that no more system processes follow and synchronize. */
   mess.PR_PROC_NR = NONE;
diff --git a/tools/Makefile b/tools/Makefile
index b0f4e837e..7c9a7e5cb 100755
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,7 +10,6 @@ MAKE=	exec make -$(MAKEFLAGS)
 PROGRAMS=	../kernel/kernel \
 	../servers/pm/pm \
 	../servers/fs/fs \
-	../servers/sm/sm \
 	../servers/is/is \
 	../drivers/tty/tty \
 	../drivers/memory/memory \