cleanup in Canvas and CanvasDelegate classes