DDF-571:Clean up of constants and code in wfs 1.0 and 2.0 impl