clean up the way in which the GetCapabilities is processed