i605: update and cleanup init

Change-Id: I9e586bef1d3aa5fdceda6b06dac2e480e128d6d4