Makefile major cleanup