Excess Contribution on 2023 & 2024

I open my Roth IRA on Sep 2021 and made contribution eary of each year.

On 2023, I made contribution on Feb 2023 as usual.

During tax season ( April 2024), I realized that my contribution is limited due to additional income(actually tax SW indicate excess contribution and thus add form 5229 include 6% penalty). It was bit late and thus filed 2023 tax. After I simply remove the excess amount from my Roth not through Fidelity ( 2nd mistake).

once again on Jan 2024, I made 2024 contribution. 

At the end of 2024 (early of 2025) I receive 1099R with code of T. I googled the code of T and realized ( assumed) that Fidelty handle this removal as withdraw.

Again bit late, I decided 2024 tax file first and remove properly. While tax filing, I again learn excess contribution on 2024.

On April 2025, I remove the 2023 excess via Fidelity.

On May  2025, I remove the 2024 excess via Fidelity.

At the end of 2025 ( early 2026), I received two 1099R with code of PJ(2024 removal) and T(2023 removal).

In 1099R with PJ, I see $163.75 in Item 2a - Taxable amount. 

What steps should I have to do before 2025 tax filing?

2024 amendment is needed? 

2023 excess is properly removed?