(Release 6.4.0) Remove shrinkwrap