Cleanup watch names