clean-up code