Deductions & credits

The 2019 contribution is fine. 

For the 2020 contribution you  will need to specifically inform your HSA trustee of a correction and that you wish to remove an excess contribution to your HSA. This triggers them to classify the transaction separately, as opposed to a normal withdrawal for qualified medical expenses. They will proceed to file an additional Form 1099-SA showing the excess contribution being distributed from the HSA with a distribution code of “2”. Be sure to remove and identify any earnings on the excess contribution as well. This form will be provided to you to indicate 1) a distribution from the account that 2) was for excess contributions.