Removed unused variables/import

Change-Id: I41134ac4b08298f06221a63d405c1600f0f68325