Removed unused imports

Change-Id: Id7d717a44931ad958efb7cf6f5bfa6f319624ff7