Remove macros.j2. Clean up Makefile.