Delete redundant file
Merge branch 'development'