demo clean-up