fix trigger HT binning; cleanup