Cleaning up the mess that is the bundle unzipping