clean up and shrinkwrap