e610: cleanup init

Change-Id: Ic222fbdf33851212d0f736d0d4fa92f68392fb13