WP-2919 Cleaning up the code after testing.