Unused imports and cleanup

Change-Id: I06f9af2da18d5bb2ec7827ba3a12d0c33c76f87d