code cleanup

Change-Id: I4aa20e1c0915282aa9c83f8c7e1774b25cc1ddf0