cleaning up some submodules