Retirement tax questions

I have a few follow up questions: 

 

- Where in TurboTax do I report that I withdrew my excess from 2017?

- Since I withdrew the excess before the filing deadline, would I still have to pay the 6% penally for 2019?