Code cleanup.

Change-Id: I53dedbb613ae50c7d863412f09d38d13cad4979d