diff --git a/src/kiwmi/events.c b/src/kiwmi/events.c
deleted file mode 100644
index f8fe5f1..0000000
--- a/src/kiwmi/events.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (c), Niclas Meyer <niclas@countingsort.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-#include "events.h"
-
-#include <stdlib.h>
-
-#include <xcb/xcb.h>
-
-void
-handle_xcb_event(xcb_generic_event_t *event)
-{
-	switch (event->response_type) {
-	case XCB_CREATE_NOTIFY:
-		// TODO: insert into tree
-		break;
-	case XCB_DESTROY_NOTIFY:
-		// TODO: destroy window
-		break;
-	}
-
-	free(event);
-}
diff --git a/src/kiwmi/events.h b/src/kiwmi/events.h
deleted file mode 100644
index 1efe606..0000000
--- a/src/kiwmi/events.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright (c), Niclas Meyer <niclas@countingsort.com>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-#ifndef EVENTS_H
-#define EVENTS_H
-
-#include <xcb/xcb.h>
-
-void handle_xcb_event(xcb_generic_event_t *event);
-
-#endif /* EVENTS_H */
diff --git a/src/kiwmi/main.c b/src/kiwmi/main.c
index 7080afc..d3159dd 100644
--- a/src/kiwmi/main.c
+++ b/src/kiwmi/main.c
@@ -20,7 +20,6 @@
 
 #include <xcb/xcb.h>
 
-#include "events.h"
 #include "ipc.h"
 #include "xcb.h"
 
@@ -124,12 +123,11 @@ main(int argc, char *argv[])
 			if (!event) {
 				die("XCB connection broke\n");
 			}
-
-			handle_xcb_event(event);
 		}
 	}
 
 	close(g_sock_fd);
+	xcb_disconnect(g_dpy);
 }
 
 static void