More cleanup for submodule preparation