Remove erroneous files
Merge branch 'dev'

merge branch dev