More lint cleanups. Remove redundant and dead code.

Change-Id: If97a8849e8eac3a007a697b7e882a0b804b6a9f1