code cleanup

Change-Id: Ie315e1d3361868f2ef14971d67f4ab483caa2f16