Clean up useless code, logging, and a typo.

Change-Id: I8c2296e7f60037907a969bcaf1746644e32868c3
6 files changed