Merge "Remove dead code for render needing an update (no such case at the moment...