Unused imports

Change-Id: I386f4da03f4ecc67dc6b841878ed34bf74e61115