Clean up partial rip on failure or cancellation