Remove unused use clauses and fix typo in a class name

Change-Id: I72a07642123864c6e54203372e520c9805b39bbd