clean up for init

Change-Id: Ic5e70155a136cd8ca7f5a586a2e15bd73e53267b