Fixed pull request comments, Removed more useless files.