cosmetic fixes: removing unused members/imports

Change-Id: I307e5d5c7c1270d2590ba66f4c3d3b1a96646344
1 file changed