Fix remove old code