Remove unnecessary tool
Removes definition of HIJetClusterSubtractorTool ("cl_subtr_tool") that wasn't used anywhere. Also moves the setup for the correct file name of InputFile for HITowerWeightTool closer to the HITowerWeightTool's definition.
(This time merging to 23.0)