added clean-up step