Clean up the rest of the api uses

Change-Id: Ia3ea86ccdd3fdd85868db049966bcf763b26028f
Merge "Clean up the rest of the api uses"