now, rearranging BOM usage to streamline a bit more, and removing one final reference to sisu that doesn't use the BOM version