Remove unused imports and some cleanup

Change-Id: I4689116688ae61fccf9d9cd6ecaee1394637fd8b