(Release 8.0.1) Remove shrinkwrap