7824: clean up Canvas