Better constant names, removed unused code, general cleanup.

Change-Id: Iebf6d6c930c146e83d6963674d63ee322e831f3e
13 files changed