diff --git a/Makefile b/Makefile
index 7f58cb652a8499143c07f85264ce2ac1b0d0af0b..56171dfd9b0973702714a8fd5941a4b81769c2a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 include ${FSLDIR}/etc/default.mk
 
+USRCXXFLAGS = -DTESTING
 USRINCFLAGS = -I${INCDIR}/newimage_dev -I${INCDIR}/miscmaths_dev \
 	-I${INCDIR}/avwio -I${INCDIR}/newmat -I${INCDIR}/libprob
 #DBGFLAGS = -g
@@ -21,22 +22,12 @@ CLUSTER = cluster
 COBJS = cluster.o infer.o options.o
 CLIBS = -lnewimage_dev -lmiscmaths_dev -lavwio -lnewmat -lprob
 
-XFILES = ${SMOOTHEST} ${CLUSTER}
+XFILES = 
 
-SCRIPTS = cluster2html
-
-all: ${XFILES} ${INFERTEST}
-
-${SMOOTHEST}: ${SOBJS}
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${SOBJS} ${SLIBS}
+all: ${OPTIONS}
 
 ${OPTIONS}: ${OOBJS}
 	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OOBJS} ${OLIBS}
 
-${INFERTEST}: ${IOBJS}
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${IOBJS} ${ILIBS}
-
-${CLUSTER}: ${COBJS}
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${COBJS} ${CLIBS}