code cleanup

Change-Id: I4576fa46347022cebf6fac2431e9a313a59bf8f2