Various cleanups produced by Refaster

Change-Id: Ic0cf71050e3c8b33baf17d7e9eac119f1dfe9a97
16 files changed