(Release 9.3.1) Remove shrinkwrap