code cleanup

Change-Id: Ia1a9f8f92c24e0f628e5f07f39e10d8b40690db0