clean up for init

Change-Id: If258263808980e3cf4fd8bcd2dd052fef0a07511