diff --git a/Makefile b/Makefile
index 9590b38..d2bd690 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,15 @@
 LIBS=-lpcre -lcrypto -lm -lpthread
 CFLAGS=-ggdb -O3 -Wall
-OBJS=vanitygen.o oclvanitygen.o oclbntest.o pattern.o util.o
-PROGS=vanitygen oclvanitygen keytool
-TESTS=oclhbntest
+OBJS=vanitygen.o oclvanitygen.o pattern.o util.o
+PROGS=vanitygen
 
-all: $(PROGS) $(TESTS)
+all: $(PROGS)
 
 vanitygen: vanitygen.o pattern.o util.o
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS)
 
-keytool: keytool.o util.o
-	$(CC) $^ -o $@ $(CFLAGS) $(LIBS)
-
 oclvanitygen: oclvanitygen.o pattern.o util.o
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS) -lOpenCL
 
-oclhbntest.o: oclhbntest.c calc_addrs.cl
-	$(CC) -c $< -o $@ $(CFLAGS) -m32
-
-oclhbntest: oclhbntest.o
-	$(CC) $^ -o $@ $(CFLAGS) -m32 libcrypto32.a -lz -ldl -lpthread
-
 clean:
 	rm -f $(OBJS) $(PROGS) $(TESTS)
diff --git a/Makefile.osx b/Makefile.osx
index a16ddda..6ddbee5 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -1,15 +1,15 @@
 LIBS=-lpcre -lcrypto -lm -lpthread
 CFLAGS=-ggdb -O3 -Wall
-OBJS=vanitygen.o oclvanitygen.o pattern.o
+OBJS=vanitygen.o oclvanitygen.o pattern.o util.o
 PROGS=vanitygen
 TESTS=
 
 all: $(PROGS)
 
-vanitygen: vanitygen.o pattern.o
+vanitygen: vanitygen.o pattern.o util.o
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS)
 
-oclvanitygen: oclvanitygen.o pattern.o
+oclvanitygen: oclvanitygen.o pattern.o util.o
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS) -framework OpenCL
 
 clean: