Cleaning up imports and dead code.

Change-Id: Ie59fa7fc7c69eb375792c9227295d75c4672e802
23 files changed