Code cleanup

Change-Id: Id9b42153c5371bac3a942574ebd5899bbc6ffad6