More submodules cleanups