diff --git a/Makefile b/Makefile
index d95e6ac..57e9582 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,10 @@ RANLIB=ranlib
 
 ifeq ($(MODE), release)
 OPT=-Oz
+ifneq ($(CC), clang)
+# clang emits LLVM bitcode in lto mode, which only clang and lld understand
+OPT += -flto
+endif
 DEBUG=
 else
 OPT=-O0
diff --git a/TODO.md b/TODO.md
index 2a856c2..705466c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -20,7 +20,6 @@ Not everything OC has (as a few of them are really MC-centered) but most of it.
 - `internet` component (note: NN does not handle internet requests, those are up to the emulator)
 - `relay` component (note: OCDoc still refers to it as `access_point`)
 - `geolyzer` component
-- `net_splitter` component
 - `redstone` component
 - `motion_sensor` component
 - `printer3d` component (note: maybe add signal for when printer completes?)