Ditch various unused Combiner code from video-rice