Code cleanup.

Change-Id: Ifefc528b425ed9ae7f1cdba47282a4f0875bd728