yes, the $21,000 was deducted..... you used it to achieve the 7.5% minimum for the deduction of the part above $21,000.
You get to use it either as part of the calculation of Schedule A or as a distribution of the HSA. If you use it in both places, it's 'double dipping'.
