diff --git configure.ac configure.ac
index 2cac063..bab8855 100644
--- configure.ac
+++ configure.ac
@@ -640,36 +640,6 @@ else
 fi
 AM_CONDITIONAL(ENABLE_NNTP, [test x$enable_nntp = xyes])
 
-dnl **************************************************
-dnl New IMAP code support.
-dnl **************************************************
-AC_ARG_ENABLE([imapp],
-	AS_HELP_STRING([--enable-imapp],
-	[Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code]),,
-	[enable_imapp=no])
-if test "x$enable_imapp" = "xyes"; then
-	AC_DEFINE(ENABLE_IMAPP,1,[Really don't try this at home])
-	msg_imapp=yes
-else
-	msg_imapp=no
-fi
-AM_CONDITIONAL(ENABLE_IMAPP, [test x$enable_imapp = xyes])
-
-dnl **************************************************
-dnl New IMAP code support.
-dnl **************************************************
-AC_ARG_ENABLE([imap4],
-	AS_HELP_STRING([--enable-imap4],
-	[Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]),,
-	[enable_imap4=yes])
-if test "x$enable_imap4" = "xyes"; then
-	AC_DEFINE(ENABLE_IMAP4,1,[Really don't try this at home])
-	msg_imap4=yes
-else
-	msg_imap4=no
-fi
-AM_CONDITIONAL(ENABLE_IMAP4, [test x$enable_imap4 = xyes])
-
 AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is free'ed properly])
 
 dnl **************************************************
@@ -1484,8 +1454,6 @@ else
 fi
 AC_SUBST(TNEF_CFLAGS)
 
-echo "TNEF is "$TNEF_ATTACHMENTS
-
 dnl Check for dbus-glib-1 and dbus
 AC_ARG_ENABLE([dbus],
 	[AS_HELP_STRING([--enable-dbus],