Roth IRA Excess Contribution from 2022

We both made a $7,000 contribution to a Roth IRA in 2022 and due to a sale of property had excess income. We paid the 6% penalty when filing in 2022. In 2023 claimed we still had excess Roth IRA, no penalty was listed on Form 5329. In 2024, I removed the $7,000 from the my Roth IRA and received a 1099-R. My husband had the funds moved from his Roth IRA in 2024 and put into his 401K plan with the same company that we had our Roth IRA's with. I am not sure how to enter on this year's (2024) tax return. I am also wanted to go back and check if the 2023 return Roth IRA info was entered correctly. Any suggestions on how to be rid of this fiasco once and for all?? Thank you

posted