code cleanup

Change-Id: I78d1d1245eac26e498e6477580255a48003f21a0