Remove jet substructure part, since it is now in a separate calculator
Added missing std
Adapt to change in interface of el selector