code cleanup

Change-Id: I63bbc3d666f86ca6c35c9dfc01bc4c47ed282a44