President Donald Trump has withdrawn his proposed 20% toll on cargo passing through the Strait of Hormuz, replacing it with trade and investment deals with Gulf states.