Cleaning up dead code, fixing makefile.