Trying to get submodules clean