Remove unused use clauses

Change-Id: I813ba4fcc75d41c7f6c4785f2b2b85f80717a238
Merge "Remove unused use clauses"