Removing old code

--HG--
branch : Production