Additional clean-up of Canvas.