Remove all traces of deleted modules.
Update submodules
Merge branch 'master' into oxygen-mac