Remove unused uses

Change-Id: I3831785ceb936ab0f0d65ee574b1ecfa8abf134e
Merge "Remove unused uses"