(Release 8.0.2) Remove shrinkwrap