Cleaning up some submodules