@ChampChiran
I receive your email, my understanding is I can remove the excess before the tax due date and add a substitute 1099R in 2019 tax return. Edit the substitute 1099R as you indicated, without tax withheld. Then I can ignore the 1099R I will receive in 2021, and no Amend is needed.
