clean up for init

Change-Id: Ifda0c1919d0ce4790c8d768cf2d7c7af532606d8