Code cleanup.

Change-Id: Ib544218a9566ee048f976e71a0bf1d5685591d6c