Makefile clean-up 2