remove dead code
makefile fixes