Retirement tax questions

I paid all the tax this year.

 

For Federal

I would submit a 1099-X which indicates a amended return

I would submit a revised Form 8915-E that indicates I paid it all back

Turbotax automatically updates the federal forms I would need to submit

 

For the state Iowa state return I would need to go in and manually decrease the income to the IA 1040 Line 9 which is the income pensions/annuities by the same amount.

 

Do i have this correct?

 

Thanks