remove unused "using"s

Change-Id: I5c55031a1678cd3fbd439de46c1586901be2ba4a
Merge "remove unused "using"s"