public clean-up