Remove redundant files and update Makefile