fusion3: init update and cleanup

Change-Id: I0c0e0bf5dba1fecd7058cfdeccc6f3c475d3d227