[Optim] Ported to canvas
Misc cleanup