WP-4589 remove unused items