Removing more redundant stuff - compiles in CMSSW 612 SLHC6 patch1