Some code clean-up.

Change-Id: I626c4c40c32dbf43408e0649364dfe8be2bb2321
2 files changed