WELD-1784 Remove dead code