Partial clean-up