Refactor CDH BOM, simplify