added clean-up method to Setup