Cleanup benchmark code and makefile
Cleanup