clean-up changed