MDL-31989: Remove unwanted code