simplify code and comment regarding determination whether or not AHT is used.