Adding clean-up back in