WELD-1661 Remove dead code