Makefile cleanup via magic (may not be fully working