removed unneeded file
Merge branch 'develop'