Ensure patch residual files are cleaned up