rem unused use

Change-Id: Ia27d5358c0689f1c7843841a8fb97f3c72d9f5ec
Fixed class refs

Change-Id: Ibe92417b5c5d3aa071c17a140c3886a1da42fc5a
Merge "rem unused use"
Merge "Fixed class refs"