Remove solder

Changes for WFK (WFK2-398)