c5a58437e6
This change doesn't change the functionality but removes dead code and simplifies various places to remove warnings. Change-Id: I371e06bfbd587dbf0eeafc69787b9805f7008f62