general cleanup of Makefile