Excess HSA from 2023 Next steps

I had made excess $1035 HSA contribution in 2023. Identified it in March 2025. My HSA custodian returned my excess amount $1035 in March 2025 itself. My understanding is that i need to pay 6% penalty for 2023 and since i removed excess before April 15 2025 does not have to pay penalty for 2024.

  1. Do I need to amend my 2023 taxes?

  2. Which Tax year my $1035 excess distribution fall into for other income Tax in schedule 1(2023 or 2024 or 2025)?

  3. Do i need to file Form 5329 for both 2023 and 2024?

  4. Which year 8889 Forms captures the $1035 excess distribution?