remove cba dependency, minor model tweaks