canvasfeature code cleanups in preparation for progress