Fix warnings and remove dead code

Change-Id: Ifd1bcd8f5be181b115910f2f8918e1e50975a790
9 files changed