code cleanup

Change-Id: Ic074d461e1d5e9d755170029c58ad716ca42b3a8