Move Cleanup to end.