waterfall clean-up