Removing some dead code / strings

issue 14161836

Change-Id: I44aa0c3109b1b0efe8e1be80eb4c4f373c02994a
3 files changed