Makefile cleanups, round 1