Further solution cleanup.