rem unused use statements

Change-Id: I1d1bd003f33823c23099031be3da7344ff5b99b7
Merge "rem unused use statements"