Small clean up

Change-Id: Ib83ee9ebef961c1129d3fd3265a8bc698b0bcd5a