Solution clean up