Delete submodules
Merge branch 'dev'