Eleven: Rest of today's cleanup

* A few imports
* A few weak references
* A few annotations
* Minor edits to improve code: unused methods and vars

Change-Id: I74dc1b4f87142333fdb1a009184c2058bfdb42ff
33 files changed