code cleanup

Change-Id: I8caa410d08767b12e2867cbbac35af85ca767033