Get your taxes done using TurboTax

If the excess was added to the 1040 line 1 you are done and can ignore the 1099-R with the code P when it comes.  (Don't add it twice by using both methods).

If you receive another 1099-R with a code 8 then that is to be entered in 2019 to report any earnings returned in 2019.
**Disclaimer: This post is for discussion purposes only and is NOT tax advice. The author takes no responsibility for the accuracy of any information in this post.**