Fix the init cleanup order