Remove unneeded submodules
Merge branch 'develop'