Removed unneeded files, updated Makefile