ISPN-3208 Remove Solder from CDI module