WELD-1757 Code cleanup