diff --git a/main.c b/main.c
index 7606adc..39c11dc 100644
--- a/main.c
+++ b/main.c
@@ -87,8 +87,6 @@ main0(void)
   cprintf("loaded userfs\n");
 
   scheduler();
-
-  return 0;
 }
 
 // Additional processors start here.
diff --git a/mp.c b/mp.c
index c6e7d3f..875bf3f 100644
--- a/mp.c
+++ b/mp.c
@@ -1,7 +1,6 @@
 #include "types.h"
 #include "mp.h"
 #include "defs.h"
-#include "memlayout.h"
 #include "param.h"
 #include "x86.h"
 #include "traps.h"