some cleanup and ensure we do not send data that may cause datadog issues