Remove test code, update makefile