Added missing clean up