cleanups on global and wfs to merge