WP-4035 remove unwanted code