Clean up sample files and makefile