Removed unused variables/import

Change-Id: I028afba9a01cc031e9f5d5fc5a01363491976709