Removed cb checking