Adjust the 2D classes to only use the canvas, not graphic context