clean-up and notes