WP-3916 remove unwanted fields