Remove dead strings and code

Change-Id: Iacd5c1bee978a52b2e534a2c9db5a1b98f5bd48e
4 files changed