Solution clean up.