diff --git a/kernel-src/fs/file.c b/kernel-src/fs/file.c
index 8ab0e4f1..33336939 100644
--- a/kernel-src/fs/file.c
+++ b/kernel-src/fs/file.c
@@ -5,8 +5,6 @@
 #include <errno.h>
 #include <kernel/alloc.h>
 
-// TODO have a limit for the fd table
-
 static scache_t *filecache;
 #define FILE_HOLD(f) __atomic_add_fetch(&(f)->refcount, 1, __ATOMIC_SEQ_CST)
 
diff --git a/kernel-src/include/x86-64/arch/context.h b/kernel-src/include/x86-64/arch/context.h
index 4f1de9b5..301f6c02 100644
--- a/kernel-src/include/x86-64/arch/context.h
+++ b/kernel-src/include/x86-64/arch/context.h
@@ -82,7 +82,6 @@ int arch_context_saveandcall(void (*fn)(context_t *context, void *argument), voi
 #include <string.h>
 
 // kernelgsbase is set as user because they'll be swapped in the context switch
-// TODO FPU stuff on all context macros
 #define ARCH_CONTEXT_SWITCHTHREAD(x) \
 	_cpu()->ist.rsp0 = (uint64_t)(x)->kernelstacktop; \
 	wrmsr(MSR_KERNELGSBASE, (x)->extracontext.gsbase); \
diff --git a/kernel-src/sys/syscalls/setitimer.c b/kernel-src/sys/syscalls/setitimer.c
index 46d04e9f..0be01a25 100644
--- a/kernel-src/sys/syscalls/setitimer.c
+++ b/kernel-src/sys/syscalls/setitimer.c
@@ -80,7 +80,6 @@ syscallret_t syscall_setitimer(context_t *context, int which, itimerval_t *unew,
 	uintmax_t oldremaining, oldrepeat;
 	itimer_pause(itimer, &oldremaining, &oldrepeat);
 
-	// TODO overflow check
 	uintmax_t repeatus = val.interval.s * 1000000 + val.interval.us;
 	uintmax_t newus = val.value.s * 1000000 + val.value.us;
 	itimer_set(itimer, newus, repeatus);
diff --git a/tools/netd/main.c b/tools/netd/main.c
index a5b193a4..7eaf7b7b 100644
--- a/tools/netd/main.c
+++ b/tools/netd/main.c
@@ -511,7 +511,6 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
-	// TODO routing table information
 	printoffer(&offer);
 
 	addroute(argv[1], 0, offer.router, 0, 1);