Remove more of Canna.

Fixes #11186 for real.