WP-4634 Cleanup to remove watchdog calls