Dripping unused code

--HG--
branch : Production