diff --git a/configure.in b/configure.in
index 447939f9e..453fe3d9a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(control-center)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(control-center, 2.3.2)
+AM_INIT_AUTOMAKE(control-center, 2.3.1)
 
 AM_MAINTAINER_MODE
 
@@ -128,11 +128,6 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
 BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 
-# check for nautilus
-PKG_CHECK_MODULES(NAUTILUS, libnautilus)
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(NAUTILUS_CFLAGS)
-
 # esd
 ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
 if test x"$ESDSERVERDIR" = x; then
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 8ed612dd6..53941cce1 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -10,11 +10,6 @@ sys_in_files = gnomecc.desktop.in
 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-serverdir = $(libdir)/bonobo/servers
-server_in_files = GNOME_ControlCenter.server.in
-server_DATA = $(server_in_files:.server.in=.server)
-@INTLTOOL_SERVER_RULE@
-
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = gnomecc-ui.xml
 
@@ -25,19 +20,18 @@ INCLUDES = 							\
 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"			\
 	-DART_DIR=\""$(splashdir)"\"				\
 	-DGNOME_SBINDIR=\""$(sbindir)"\"			\
-	$(GNOMECC_CFLAGS) $(NAUTILUS_CFLAGS)
+	$(GNOMECC_CFLAGS)
 
 bin_PROGRAMS = gnome-control-center
 
 gnome_control_center_SOURCES = \
-	control-center-categories.c	\
-	control-center-categories.h	\
-	control-center.c		\
-	gnomecc-event-box.c		\
-	gnomecc-event-box.h
+	main.c						\
+	capplet-dir.c 		capplet-dir.h 		\
+	capplet-dir-view.c	capplet-dir-view.h	\
+	capplet-dir-view-list.c
 
-gnome_control_center_LDADD = $(GNOMECC_LIBS) $(NAUTILUS_LIBS)
+gnome_control_center_LDADD = $(GNOMECC_LIBS)
 
-EXTRA_DIST = gnomecc.desktop.in $(splash_DATA) $(ui_DATA) $(server_DATA)
+EXTRA_DIST = gnomecc.desktop.in $(splash_DATA) $(ui_DATA)
 
 CLEANFILES = gnomecc.desktop