Removing unused files, tidying up Makefile

make bench now runs successfully