Some fixes removing a submodule