Added missing clean up phase