Miscellaneous cleanup

Change-Id: I6425a25c43de85b00c3cf7cbc0a6d7833641fff4