Implement solution clean up