r950: update and cleanup init

Change-Id: I1580c373092db4b3dfc0800dc89ca561bce97157