diff --git a/src/Makefile.am b/src/Makefile.am
index ffaecae7a..391a79d37 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,8 +31,6 @@ metacity_SOURCES= 				\
 	errors.h				\
 	eventqueue.c				\
 	eventqueue.h				\
-        expocity.c                              \
-        expocity.h                              \
 	fixedtip.c				\
 	fixedtip.h				\
 	frame.c					\
diff --git a/src/display.c b/src/display.c
index d21ec79da..bbfba65bf 100644
--- a/src/display.c
+++ b/src/display.c
@@ -56,8 +56,6 @@
 #endif
 #include <string.h>
 
-#include "expocity.h"
-
 #define USE_GDK_DISPLAY
 
 typedef struct 
@@ -1323,19 +1321,7 @@ event_callback (XEvent   *event,
   meta_compositor_process_event (display->compositor,
                                  event,
                                  window);
-
-  /* these are the window events at which expocity updates the thumbnail image
-     of the window */
-  switch (event->type)
-    {
-    case CreateNotify:
-    case ButtonRelease:
-    case KeyRelease:
-    case FocusIn:
-    case FocusOut:
-      expocity_grab_window(window);
-    }
-
+  
   switch (event->type)
     {
     case KeyPress:
diff --git a/src/keybindings.c b/src/keybindings.c
index 81ca5019b..921736e35 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -29,8 +29,6 @@
 #include "prefs.h"
 #include "effects.h"
 
-#include "expocity.h"
-
 #include <X11/keysym.h>
 #include <string.h>
 #include <stdio.h>
@@ -2914,10 +2912,7 @@ do_choose_window (MetaDisplay    *display,
 {
   MetaTabList type;
   MetaWindow *initial_selection;
-
-  expocity_run(display, screen);
-  return;  
-
+  
   type = GPOINTER_TO_INT (binding->handler->data);
   
   meta_topic (META_DEBUG_KEYBINDINGS,
diff --git a/src/main.c b/src/main.c
index ffb4aa0b2..ef8218beb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,8 +28,6 @@
 #include "session.h"
 #include "prefs.h"
 
-#include "expocity.h"
-
 #include <glib-object.h>
 #include <gmodule.h>
 #ifdef HAVE_GCONF
@@ -391,9 +389,6 @@ main (int argc, char **argv)
   /* must be after UI init so we can override GDK handlers */
   meta_errors_init ();
 
-  /* initialize the expocity addon */
-  expocity_init();
-
 #if 1
   g_log_set_handler (NULL,
                      G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
diff --git a/src/window.c b/src/window.c
index d73a86f03..3a01d27a9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -40,8 +40,6 @@
 #include "window-props.h"
 #include "constraints.h"
 
-#include "expocity.h"
-
 #include <X11/Xatom.h>
 #include <string.h>
 
@@ -1045,7 +1043,6 @@ meta_window_free (MetaWindow  *window)
 
   meta_icon_cache_free (&window->icon_cache);
   
-  expocity_free_window (window);
   g_free (window->sm_client_id);
   g_free (window->wm_client_machine);
   g_free (window->startup_id);