clean-up and InputTag in cfi file