Makefile clean-up