Remove unnecessary code
Merge pull request #11818 from s0undt3ch/2014.1

Remove unnecessary code