Clean up.

Change-Id: Ia5cc90d6c92953c36a1d3d51eabd60cec239e614
17 files changed