diff --git a/Makefile b/Makefile
index c01b08f..54b292a 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,7 @@ CFLAGS += -DAES256=1
 name = main
 
 .PHONY: all
-all: python-fido2 main
-
-.PHONY: test
-test:
-	$(MAKE) -C . main
-	$(MAKE) -C . testgcm
-	./testgcm
+all: main
 
 tinycbor/Makefile crypto/tiny-AES-c/aes.c:
 	git submodule update --init
@@ -51,6 +45,9 @@ cbor: $(LIBCBOR)
 $(LIBCBOR): tinycbor/Makefile
 	cd tinycbor/ && $(MAKE) clean && $(MAKE) -j8
 
+test:
+	$(MAKE) -C . main
+
 .PHONY: efm8prog
 efm8prog:
 	cd './targets/efm8\Keil 8051 v9.53 - Debug' && $(MAKE) all
@@ -70,13 +67,6 @@ efm32bootprog: efm32com
 $(name): $(obj) $(LIBCBOR)
 	$(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS)
 
-crypto/aes-gcm/aes_gcm.o:
-	$(CC) -c crypto/aes-gcm/aes_gcm.c $(CFLAGS) -DTEST -o crypto/aes-gcm/aes_gcm.o
-
-testgcm: $(obj) $(LIBCBOR) crypto/aes-gcm/aes_gcm.o
-	$(CC) -c fido2/main.c $(CFLAGS) -DTEST -o fido2/main.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS)
-
 uECC.o: ./crypto/micro-ecc/uECC.c
 	$(CC) -c -o $@ $^ -O2 -fdata-sections -ffunction-sections -DuECC_PLATFORM=$(platform) -I./crypto/micro-ecc/
 
@@ -94,10 +84,6 @@ venv:
 	virtualenv venv
 	./venv/bin/pip install wheel
 
-.PHONY: python-fido2
-python-fido2: venv
-	cd python-fido2/ && ../venv/bin/python setup.py install
-
 venv/bin/mkdocs: venv
 	./venv/bin/pip install mkdocs mkdocs-material
 
@@ -110,10 +96,9 @@ fido2-test:
 	./venv/bin/python tools/ctap_test.py
 
 clean:
-	rm -f *.o main.exe main testgcm $(obj)
+	rm -f *.o main.exe main $(obj)
 	for f in crypto/tiny-AES-c/Makefile tinycbor/Makefile ; do \
 	    if [ -f "$$f" ]; then \
 	    	(cd `dirname $$f` ; git checkout -- .) ;\
 	    fi ;\
 	done
-	rm -rf venv
diff --git a/README.md b/README.md
index 2465d31..2b051b4 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,6 @@ us by [signing up for our Kickstarter](https://solokeys.com/kickstarter).  Our a
 bulk order and provide open source security tokens for everyone that is interested.  We will offer 
 "hackable" tokens that come with USB bootloaders and are reprogrammable.
 
-[Sign up here](https://solokeys.com/kickstarter)!
-
 
 # Setting up
 
@@ -53,10 +51,8 @@ Clone solo and build it
 ```bash
 git clone --recurse-submodules https://github.com/SoloKeysSec/solo
 cd solo/
-
 git submodules init
 git submodules update
-
 make all
 ```
 
@@ -72,7 +68,7 @@ not a hardware authenticator.  Install Yubico's fork to do that.
 The application is set up to send and recv USB HID messages over UDP to ease
 development and reduce need for hardware.
 
-Testing can be done using our fork of Yubico's client software, `python-fido2`.  
+Testing can be done using our fork of Yubico's client software, `python-fido2`.
 Our fork of `python-fido2` has small changes to make it send
 USB HID over UDP to the authenticator application.
 
@@ -85,13 +81,13 @@ Run FIDO 2 / U2F application.
 Run example client software.  This runs through a registration and authentication.
 
 ```
-./venv/bin/python python-fido2/examples/credential.py
+python python-fido2/examples/credential.py
 ```
 
-Run the FIDO2 tests.
+Run our FIDO2 tests.
 
 ```
-make fido2-test
+python tools/ctap_test.py
 ```
 
 Follow specifications to really dig in.