Remove last references to ~str