Don't need this file anymore
Merge branch 'dev'