Update target product and poms...
Remove dead code