Cleanup for prod