In a speech in April 2016, Secretary of Defense Jim Mattis (at the time he was merely a retired general) said the U.S. should recognize Iran not as a nation-state but “a revolutionary cause devoted to mayhem…”
Obama’s Joint Comprehensive Plan of Action did not slow Iran’s military build-up — so it wasn’t very comprehensive.