Cleaned up makefiles and benchmarks.