WP-3538-1 Removed dpm() calls