Clean up submodule craziness