Solution clean-up