remove unnecessary files
Merge branch 'master' into linux-build