WP-2606 Code cleanup