Delete some unnecessary files
Merge branch 'develop'