Removed unused Imports and variables

Change-Id: Ib6d79ce3f0b7cf3cbb6716c316ecaefd2dae67f7
4 files changed