Remove test for old code
Minor cleanup of makefile