Unused imports and cleanup

Change-Id: Ifd7d06d5e803e5d86e50dde8cdadc63fc6a5222f