More cleanup.

Change-Id: Ia7985890a4259ce0f4eaed2db0010af75d466a35
1 file changed