Misc. cleanup.

Change-Id: I34d49e5e85caeac32fe6b23f1ae5ca5545afb285