Use constants in place of strings, and remove unused code.

Change-Id: I4d27cf74edefcabacffbfc59fa8fe28f5b592fa7
5 files changed