m8: More dead init entry removal

Change-Id: I2276279f8cab4c2516c2ba51c29329b5cf3e9b72