fixes to makefile, removed some old files