Clean up unused code and import declarations

Change-Id: If36fd2d99a51b07290b13f697b3ea08d31feb023
20 files changed