clean up for init

Change-Id: I59f86017140e3766d502181d294609279a298cd5