More Makefile cleanups