Fix warnings and remove dead code

Change-Id: I574d823fedf4b752c3df5a72599b390f708823ac
25 files changed