Merge "Cleaned up dead code"
am: d5a744abb6

Change-Id: Ie70c6186ea81b5066f821b5d9f818f39b2e8282e