--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,9 +3,6 @@
 if BUILD_PLUGIN_SISCONE
 SUBDIRS += SISCone
 endif
-if BUILD_PLUGIN_CDFCONES
-SUBDIRS += CDFCones
-endif
 if BUILD_PLUGIN_PXCONE
 SUBDIRS += PxCone
 endif
@@ -18,9 +15,6 @@
 if BUILD_PLUGIN_TRACKJET
 SUBDIRS += TrackJet
 endif
-if BUILD_PLUGIN_ATLASCONE
-SUBDIRS += ATLASCone
-endif
 if BUILD_PLUGIN_EECAMBRIDGE
 SUBDIRS += EECambridge
 endif
@@ -48,9 +42,6 @@
 if BUILD_PLUGIN_SISCONE
 libfastjetplugins_la_LIBADD += SISCone/libSISConePlugin.la
 endif
-if BUILD_PLUGIN_CDFCONES
-libfastjetplugins_la_LIBADD += CDFCones/libCDFConesPlugin.la
-endif
 if BUILD_PLUGIN_PXCONE
 libfastjetplugins_la_LIBADD += PxCone/libPxConePlugin.la
 endif
@@ -63,9 +54,6 @@
 if BUILD_PLUGIN_TRACKJET
 libfastjetplugins_la_LIBADD += TrackJet/libTrackJetPlugin.la
 endif
-if BUILD_PLUGIN_ATLASCONE
-libfastjetplugins_la_LIBADD += ATLASCone/libATLASConePlugin.la
-endif
 if BUILD_PLUGIN_EECAMBRIDGE
 libfastjetplugins_la_LIBADD += EECambridge/libEECambridgePlugin.la
 endif
@@ -84,6 +72,6 @@
 # end monolithic plugin section -- do not modify this line
 endif
 
-DIST_SUBDIRS = GridJet D0RunICone CMSIterativeCone Jade EECambridge ATLASCone TrackJet SISCone CDFCones PxCone D0RunIICone NestedDefs
+DIST_SUBDIRS = GridJet D0RunICone CMSIterativeCone Jade EECambridge TrackJet SISCone PxCone D0RunIICone NestedDefs
 
 EXTRA_DIST = makefile.static
--- a/plugins/SISCone/Makefile.am
+++ b/plugins/SISCone/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = siscone fastjet .
+SUBDIRS = fastjet .
 
 if MONOLITHIC_PLUGINS
 noinst_LTLIBRARIES = libSISConePlugin.la
--- a/configure.ac
+++ b/configure.ac
@@ -261,9 +261,7 @@
 fi
 
 dnl SISCone
-ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes,
-	         [CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone"
-                  CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"])
+ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes)
 AC_CONFIG_SUBDIRS(plugins/SISCone/siscone)
 dnl alternatively, to build SISCone directly from the FastJet build
 dnl system, comment out the previoous lines and uncomment the ones
@@ -272,10 +270,6 @@
 dnl   AM_CONFIG_HEADER(config.siscone.in.h:plugins/SISCone/siscone/siscone/config.h.in)
 dnl   AC_CONFIG_FILES(plugins/SISCone/siscone/Makefile plugins/SISCone/siscone/siscone/Makefile plugins/SISCone/siscone/siscone/spherical/Makefile plugins/SISCone/siscone/examples/Makefile plugins/SISCone/siscone/examples/events/Makefile)
 
-dnl CDFCones
-ACX_CHECK_PLUGIN(CDFCones, cdfcones, CDFCONES, yes)
-AC_CONFIG_FILES(plugins/CDFCones/CDFcode/Makefile)
-
 dnl PxCone
 ACX_CHECK_PLUGIN(PxCone, pxcone, PXCONE, no)
 
@@ -288,9 +282,6 @@
 dnl TrackJet
 ACX_CHECK_PLUGIN(TrackJet, trackjet, TRACKJET, no)
 
-dnl ATLASCone
-ACX_CHECK_PLUGIN(ATLASCone, atlascone, ATLASCONE, no)
-
 dnl CMSIterativeCone
 ACX_CHECK_PLUGIN(CMSIterativeCone, cmsiterativecone, CMSITERATIVECONE, no)
 
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -43,7 +43,7 @@
 03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
 03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
 03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
-03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
+03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la -lsiscone_spherical -lsiscone
 else
 EXTRA_DIST += 03-plugin.cc
 endif
@@ -125,7 +125,7 @@
 fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
 if BUILD_PLUGIN_SISCONE
 fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
-fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
+fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la -lsiscone_spherical -lsiscone
 endif
 
 fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc
@@ -135,11 +135,7 @@
 fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la 
 if BUILD_PLUGIN_SISCONE
 fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
-fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
-endif
-if BUILD_PLUGIN_CDFCONES
-fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones
-fastjet_timing_plugins_LDADD += ../plugins/CDFCones/libCDFConesPlugin.la ../plugins/CDFCones/CDFcode/libCDFcode.la
+fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la -lsiscone_spherical -lsiscone
 endif
 if BUILD_PLUGIN_PXCONE
 fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/PxCone
@@ -153,10 +149,6 @@
 fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/TrackJet
 fastjet_timing_plugins_LDADD += ../plugins/TrackJet/libTrackJetPlugin.la
 endif
-if BUILD_PLUGIN_ATLASCONE
-fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/ATLASCone
-fastjet_timing_plugins_LDADD += ../plugins/ATLASCone/libATLASConePlugin.la
-endif
 if BUILD_PLUGIN_EECAMBRIDGE
 fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/EECambridge
 fastjet_timing_plugins_LDADD += ../plugins/EECambridge/libEECambridgePlugin.la