Added cleanup phase after features