bundling: Clean up a bit more the bundle preparation script