removed unnecessary files and code
Merge remote-tracking branch 'origin/master'