Packaging cleanup for patch