Zap data bags that we do not need.
Update submodule ref