Removed unused files
Merge branch 'develop'