Cleanup to make the solution work.