Makefile cleanups