diff --git a/CLASH.system b/CLASH.system
index dbcb6bc..c6f75f1 100644
--- a/CLASH.system
+++ b/CLASH.system
@@ -14,15 +14,6 @@
 ;;;; 
 ;;;; 
 
-#+NIL
-(defsystem "CLASH-SYS"
-    :source-pathname "src/sys"
-    :source-extension "cl"
-    :components
-    ((:file "package")
-     (:file "mp" :depends-on ("package"))
-     (:file "socket" :depends-on ("package"))))
-
 (defsystem "CLASH"
     :source-pathname #.(merge-pathnames
 			"src/"
@@ -63,5 +54,8 @@
 	      :depends-on ("base"))
      (:module "driver"
 	      :source-pathname "drivers"
-	      :components (#+CMU (:file "simple-cmu"))
+	      :components (#+(and :CMU :MP (not :CLASH-EVENT))
+	                   (:file "simple-cmu")
+	                   #+(or :CLASH-EVENT (and :CMU (not :MP)))
+			   (:file "event-cmu"))
 	      :depends-on ("base" "main"))))