Retirement tax questions

Thank you. The information is very informative. I now know what to do for the 2021 and 2022 excess. For the 2020 excess, the only option is to wait until I get the 1099-R next year and file an amended tax return for 2020 tax year in 2023?