Further code simplification and clean up.

Change-Id: Ifdb17b56090a317b2aa82cf125d57934902c5298
7 files changed