code cleanup

Change-Id: I34405e68a746c7193ba079c8d7c37b067953f0c7