WP-2448 A little more cleanup on removing the unneeded fields