Clean up for CMSSW