WFK2-758: remove solder dependencies