Trump to remove Rwanda and South Africa from US trade deal