Cleaned up some submodules