removing unused import and commented codes

Change-Id: I7d50e2fa9013f65d53d77209f43b2d177c16e923