more, final? Makefile cleanups