toplevel Makefile cleanup