WP-3954 removed unused functions