Ensure orphan payloads or manifests are cleaned up