cleanup Makefile
cleanup more