Moving Clients from Cleanup to Production