Fix HT and MHT.

Also remove commented out code.