Remove most uses of CanvasOutput. in favor of this.