minor cleanup

Change-Id: I110c14a496c974255f10a215298739326a19760d