WP-3037 Removing unneeded fieldsets