General Makefile cleanup