code cleanup

Change-Id: Idc59144c4b22ee90bae56ec9f3d0f4dd72ede832