Code clean up.

Internal issue number: 2195990
8 files changed