Remove CD dependency of Raiden II