minor cleanup

Change-Id: I1d4529e874a14a7499b57b69df8f9ee6b0fc93ce