Enter all forms exactly as received, no modifications.
When completing the HSA contribution section and TurboTax indicates that your HSA contributions included an excess contribution, indicate that you will (or did) have the excess returned and indicate the amount of excess returned (without the adjustment for earnings).
Note that only actual excess contributions are permitted to be returned. If the calculations done by TurboTax don't indicate that there was an excess contribution, TurboTax will not provide an opportunity to indicate an excess as having been returned.
