Removing some unnecessary submodules