Merge "Remove dead strings and code"