I over-contributed to my Roth IRA in 2020 and removed both the contribution and gains on 3/15/21 (before tax deadline). Do I need to file a 5329 with my 2021 taxes?

I think I am only subject to the 10% penalty on the gains, but not sure where to report this or if I need to file an amended 2020 return.