Merge "Remove unused strings"