Remove CB dependency