Clean up canal rendering

This does not change rendering.