Toplevel Makefile cleanup