Clean up.

Change-Id: I9561ef1da4dd442edde633b331b94d75c4c96507