Technical debt paydown

Removed unused function.
Removed unused data table.
Cleaned up TAG strings.

Change-Id: I4c5dbd72f7363dd0a7a60eb2498e122adda43211
3 files changed