diff --git a/bin/dwn b/bin/dwn
index 97d84c3..ebd8535 100755
Binary files a/bin/dwn and b/bin/dwn differ
diff --git a/build/ai.o b/build/ai.o
index 9b24d1f..134230b 100644
Binary files a/build/ai.o and b/build/ai.o differ
diff --git a/build/autostart.o b/build/autostart.o
index 2e7f715..a6d6a22 100644
Binary files a/build/autostart.o and b/build/autostart.o differ
diff --git a/build/client.o b/build/client.o
index 990bdb1..da60ae1 100644
Binary files a/build/client.o and b/build/client.o differ
diff --git a/build/config.o b/build/config.o
index 2667080..9ff40ca 100644
Binary files a/build/config.o and b/build/config.o differ
diff --git a/build/decorations.o b/build/decorations.o
index faaa59c..64427d8 100644
Binary files a/build/decorations.o and b/build/decorations.o differ
diff --git a/build/demo.o b/build/demo.o
index cbfb163..c6d4db1 100644
Binary files a/build/demo.o and b/build/demo.o differ
diff --git a/build/keys.o b/build/keys.o
index 446ea3a..3048b88 100644
Binary files a/build/keys.o and b/build/keys.o differ
diff --git a/build/layout.o b/build/layout.o
index 0c5f26e..3e600f9 100644
Binary files a/build/layout.o and b/build/layout.o differ
diff --git a/build/main.d b/build/main.d
index 0bb59fa..aa82306 100644
--- a/build/main.d
+++ b/build/main.d
@@ -21,7 +21,7 @@ build/main.o: src/main.c include/dwn.h include/config.h include/dwn.h \
  /usr/include/dbus-1.0/dbus/dbus-threads.h include/systray.h \
  include/news.h include/applauncher.h include/ai.h include/autostart.h \
  include/services.h include/api.h include/demo.h include/screenshot.h \
- include/ocr.h include/sysmon.h include/util.h
+ include/ocr.h include/util.h
 include/dwn.h:
 include/config.h:
 include/dwn.h:
@@ -61,5 +61,4 @@ include/api.h:
 include/demo.h:
 include/screenshot.h:
 include/ocr.h:
-include/sysmon.h:
 include/util.h:
diff --git a/build/main.o b/build/main.o
index c416aa6..3f05ec5 100644
Binary files a/build/main.o and b/build/main.o differ
diff --git a/build/news.o b/build/news.o
index f88d348..67cf19d 100644
Binary files a/build/news.o and b/build/news.o differ
diff --git a/build/notifications.o b/build/notifications.o
index b779828..59a15ce 100644
Binary files a/build/notifications.o and b/build/notifications.o differ
diff --git a/build/panel.o b/build/panel.o
index e4b69d2..397e2df 100644
Binary files a/build/panel.o and b/build/panel.o differ
diff --git a/build/systray.o b/build/systray.o
index 00565a3..24c3fa7 100644
Binary files a/build/systray.o and b/build/systray.o differ
diff --git a/build/util.o b/build/util.o
index 258492c..040b5ea 100644
Binary files a/build/util.o and b/build/util.o differ
diff --git a/build/workspace.o b/build/workspace.o
index f80314e..f30e2c6 100644
Binary files a/build/workspace.o and b/build/workspace.o differ
diff --git a/include/dwn.h b/include/dwn.h
index 8013273..a59f9d2 100644
--- a/include/dwn.h
+++ b/include/dwn.h
@@ -107,7 +107,6 @@ typedef struct Workspace Workspace;
 typedef struct Monitor Monitor;
 typedef struct Panel Panel;
 typedef struct Config Config;
-typedef struct SystemMonitor SystemMonitor;
 
 struct Client {
     Window window;
@@ -177,8 +176,6 @@ typedef struct {
     Panel *top_panel;
     Panel *bottom_panel;
 
-    SystemMonitor *sysmon;
-
     Config *config;
 
     bool running;
diff --git a/src/main.c b/src/main.c
index 7ba6536..00e64a5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,7 +24,6 @@
 #include "demo.h"
 #include "screenshot.h"
 #include "ocr.h"
-#include "sysmon.h"
 #include "util.h"
 
 #include <stdio.h>
@@ -344,12 +343,7 @@ static void handle_map_request(XMapRequestEvent *ev)
         return;
     }
 
-    SystemMonitor *sysmon = sysmon_find_by_window(ev->window);
-    Client *client = client_manage(ev->window);
-    
-    if (sysmon != NULL && client != NULL) {
-        sysmon_set_client(sysmon, client);
-    }
+    client_manage(ev->window);
 }
 
 static void handle_unmap_notify(XUnmapEvent *ev)
@@ -464,10 +458,6 @@ static void handle_expose(XExposeEvent *ev)
         return;
     }
 
-    if (dwn->sysmon != NULL) {
-        sysmon_render(dwn->sysmon);
-    }
-
     if (dwn->top_panel != NULL && ev->window == dwn->top_panel->window) {
         panel_render(dwn->top_panel);
         return;
@@ -539,10 +529,6 @@ static void handle_button_press(XButtonEvent *ev)
         return;
     }
 
-    if (dwn->sysmon != NULL) {
-        sysmon_handle_event(dwn->sysmon, (XEvent *)ev);
-    }
-
     if (volume_slider != NULL && volume_slider->visible) {
         if (ev->window == volume_slider->window) {
             volume_slider_handle_click(volume_slider, ev->x, ev->y);
@@ -579,11 +565,6 @@ static void handle_button_press(XButtonEvent *ev)
     }
 
     if (is_client_window) {
-        SystemMonitor *sysmon = sysmon_find_by_window(ev->window);
-        if (sysmon != NULL) {
-            sysmon_handle_event(sysmon, (XEvent *)ev);
-            return;
-        }
         XAllowEvents(dwn->display, ReplayPointer, ev->time);
         client_focus(c, true);
         return;
@@ -667,12 +648,6 @@ static void handle_motion_notify(XMotionEvent *ev)
         return;
     }
 
-    SystemMonitor *sysmon = sysmon_find_by_window(ev->window);
-    if (sysmon != NULL) {
-        sysmon_handle_event(sysmon, (XEvent *)ev);
-        return;
-    }
-
     if (volume_slider != NULL && volume_slider->visible && ev->window == volume_slider->window) {
         volume_slider_handle_motion(volume_slider, ev->x, ev->y);
         return;
@@ -945,8 +920,6 @@ int dwn_init(void)
 
     panels_init();
 
-    dwn->sysmon = sysmon_create();
-
     systray_init();
 
     xembed_init();
@@ -1019,12 +992,6 @@ void dwn_cleanup(void)
     keys_cleanup();
     xembed_cleanup();
     systray_cleanup();
-    
-    if (dwn->sysmon != NULL) {
-        sysmon_destroy(dwn->sysmon);
-        dwn->sysmon = NULL;
-    }
-    
     panels_cleanup();
     decorations_cleanup();
     workspace_cleanup();
@@ -1145,11 +1112,6 @@ void dwn_run(void)
             panel_update_clock();
             panel_update_system_stats();
             systray_update();
-            
-            if (dwn->sysmon != NULL) {
-                sysmon_update(dwn->sysmon);
-            }
-            
             last_clock_update = now;
         }
 
diff --git a/src/panel.c b/src/panel.c
index 069c6d4..2d24213 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -717,36 +717,6 @@ void panel_handle_click(Panel *panel, int x, int y, int button)
             return;
         }
     } else if (panel->position == PANEL_BOTTOM) {
-        int clock_width = panel_text_width(clock_buffer, strlen(clock_buffer));
-        int stats_width = panel_calculate_stats_width();
-        int stats_x = panel->width - clock_width - stats_width - PANEL_PADDING - WIDGET_SPACING;
-        int stats_end_x = stats_x + stats_width;
-        
-        if (x >= stats_x && x <= stats_end_x && button == 1) {
-            extern SystemMonitor *sysmon_get_instance(void);
-            SystemMonitor *mon = sysmon_get_instance();
-            if (mon != NULL) {
-                extern void sysmon_toggle(SystemMonitor *mon);
-                sysmon_toggle(mon);
-            }
-            return;
-        }
-        
-        int date_width = panel_text_width(date_buffer, strlen(date_buffer));
-        int top_proc_x = PANEL_PADDING + date_width + WIDGET_SPACING;
-        int top_proc_width = TOP_PROCESS_WIDGET_WIDTH;
-        int top_proc_end_x = top_proc_x + top_proc_width;
-        
-        if (x >= top_proc_x && x <= top_proc_end_x && button == 1) {
-            extern SystemMonitor *sysmon_get_instance(void);
-            SystemMonitor *mon = sysmon_get_instance();
-            if (mon != NULL) {
-                extern void sysmon_toggle(SystemMonitor *mon);
-                sysmon_toggle(mon);
-            }
-            return;
-        }
-        
         if (button == 1) {
             news_handle_click(x, y);
         }