WP-1575 Added some comments and removed some older code.