Cleanup, and deleting unpack dirs between patchings