excess contribution...or not?

Hello - I erroneously made an excess IRA Roth contribution in January of 2022. I subsequently received in March 2023 a distribution of that excess contribution BEFORE I submitted my 2022 taxes return in April 2023.  I received a 1099R for the March 2023 distribution. I am 68 years old.

1) was I supposed to report the excess contribution on my 2022 taxes since i received distribution PRIOR to submitting 2022 tax return in April 2023?

2) Since I just received (in Feb 2024) a 2023 Form 1099R for that distribution in March 2023, do I need to report it on my 2023 return?