General solution cleanup