Code cleanup: remove some unnecessary methods/variables

Change-Id: I21672b517b9050f82dba6d85ce4e371ebdfc9b50
2 files changed