Remove unused files and clean up Makefile