code cleanup

Change-Id: Ibbdfb1a510f21274b97e58cbad23f52e080e6863