cmssw-5.3.X-icc: cleanup