drop some old stuff, fix makefile