WP-3013-1 A little more clean up to remove some delete field cruft