Dead CB1 code - time to remove