Clean up1: GeometricInnerState and HLTDoublet|DZ changes

GeometricInnerState and HLTDoublet|DZ changes