unused code/deps cleanup
makefile fixes/cleanup