Removing and fixing some submodules