minor WMS cleanup after merge