clean up for init

Change-Id: I2d0fe66747ecb4f407361b3bd299cf18a7f180aa