remove CB1 routes and update tests