Fix rebase-taint and remove some portions of "next" base that aren't yet viable