clean init

Change-Id: I157747b8b08f59f88d8d09fd852af9e5b41fbf30