cleanup CommandId from MappedDiagnosticsContext