code cleanup

Change-Id: I1509e4c356118be6857305caa302bbea848642d8