code cleanup

Change-Id: I3f7975f129515f55e6973cae471a614660adf34d