Removed abandoned files
Merge branch 'develop'