code cleanup

Change-Id: I53822f3e3129d99e64fac9f07c90d5daf0f819d4