code cleanup

Change-Id: If086bf70258f28f0ec474f7698ddbe1370173ded