1. No you don't have to wait to file your return
2. Indicate in the HSA section, that you will remove the excess contributions before the due date. TurboTax will then remove the excess calculation from the Form 5329 and the extra tax penalty.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
