Remove everything 26/305926/1 upstream