Hardcode Makefile and more cleanup.