Merge "Remove unused string res" into main