minor cleanup

Change-Id: Ie29becf06c8e9dc9f0f575e11130290364326aeb