Some code clean-up.

Change-Id: I4b745fd5298cd61c793e3b57514b48347bd66c0e
14 files changed