Having removed $7,000, that is no longer available as non-deductible (your option when deduction allowed).
since it was never added to basis, the issue is now moot.
--
Did you make any non-deductible contributions 2022 and later, or take distributions?
Form 8606 is to be filed in those years. If no, your 2020 Form 8606 (or earlier) is still the most recently filed.
The gist: follow advice of @dmertz, the forum expert.
