removed canvas, moved changes to canvas branch