Remove cb check