report return of excess contribution

Hi, I've contributed ROTH IRA $2000 in march 2021, then had to withdraw all  on January 2022 due to too high MAGI. I sent request to my broker, Fidelity, to withdraw all my contribution. They have calculated and then returned amount of $1944 . My questions are

1, Since I don't have gains, I don't own any TAX or penalty, right?

2, If I don't own any TAX/penalty can I report the return of excess contribution on my 2021 return instead of doing amendment  after receive1099R in 2023?

3, If I file ROE on 2021 return without 1099R, for BOX2 " taxable amount should be 0", right? What code do I enter box 7?