Code cleanup.

Change-Id: Id1f1d6c0c098d94a4275188a3b4f6443ddc4843d
7 files changed