remove unused files and isse issue
Merge branch 'master' into develop