Remove upstreamed code