Remove references to unused submodules