Solution cleanup