Update submodules
Clean up submodules
Clean up mappings