Performing safe cleanup if an intermediary step was skipped (such as refusing to re-encrypt a container)