Removed unnecesary files and cleaned up Makefile accordingly