Deleted some unnecessary files
Merge origin/master
test update