Removed TODO from Canvas, not needed