Remove some unused submodules