remove more ~str literals