diff --git a/miniaudio.h b/miniaudio.h
index ca3d1f66..e7da97f3 100644
--- a/miniaudio.h
+++ b/miniaudio.h
@@ -7966,11 +7966,9 @@ struct ma_device
         ma_share_mode shareMode;            /* Set to whatever was passed in when the device was initialized. */
         ma_format format;
         ma_uint32 channels;
-        ma_channel channelMap[MA_MAX_CHANNELS];
         ma_format internalFormat;
         ma_uint32 internalChannels;
         ma_uint32 internalSampleRate;
-        ma_channel internalChannelMap[MA_MAX_CHANNELS];
         ma_uint32 internalPeriodSizeInFrames;
         ma_uint32 internalPeriods;
         ma_channel_mix_mode channelMixMode;
@@ -7991,11 +7989,9 @@ struct ma_device
         ma_share_mode shareMode;            /* Set to whatever was passed in when the device was initialized. */
         ma_format format;
         ma_uint32 channels;
-        ma_channel channelMap[MA_MAX_CHANNELS];
         ma_format internalFormat;
         ma_uint32 internalChannels;
         ma_uint32 internalSampleRate;
-        ma_channel internalChannelMap[MA_MAX_CHANNELS];
         ma_uint32 internalPeriodSizeInFrames;
         ma_uint32 internalPeriods;
         ma_channel_mix_mode channelMixMode;
@@ -47673,7 +47669,6 @@ MA_API ma_result ma_device_post_init(ma_device* pDevice, ma_device_type deviceTy
         pDevice->capture.internalFormat             = pInternalDescriptorCapture->format;
         pDevice->capture.internalChannels           = pInternalDescriptorCapture->channels;
         pDevice->capture.internalSampleRate         = pInternalDescriptorCapture->sampleRate;
-        MA_COPY_MEMORY(pDevice->capture.internalChannelMap, pInternalDescriptorCapture->channelMap, sizeof(pInternalDescriptorCapture->channelMap));
         pDevice->capture.internalPeriodSizeInFrames = pInternalDescriptorCapture->periodSizeInFrames;
         pDevice->capture.internalPeriods            = pInternalDescriptorCapture->periodCount;
 
@@ -47691,7 +47686,6 @@ MA_API ma_result ma_device_post_init(ma_device* pDevice, ma_device_type deviceTy
         pDevice->playback.internalFormat             = pInternalDescriptorPlayback->format;
         pDevice->playback.internalChannels           = pInternalDescriptorPlayback->channels;
         pDevice->playback.internalSampleRate         = pInternalDescriptorPlayback->sampleRate;
-        MA_COPY_MEMORY(pDevice->playback.internalChannelMap, pInternalDescriptorPlayback->channelMap, sizeof(pInternalDescriptorPlayback->channelMap));
         pDevice->playback.internalPeriodSizeInFrames = pInternalDescriptorPlayback->periodSizeInFrames;
         pDevice->playback.internalPeriods            = pInternalDescriptorPlayback->periodCount;
 
@@ -49019,14 +49013,12 @@ MA_API ma_result ma_device_init(ma_context* pContext, const ma_device_config* pC
     pDevice->capture.shareMode           = pConfig->capture.shareMode;
     pDevice->capture.format              = pConfig->capture.format;
     pDevice->capture.channels            = pConfig->capture.channels;
-    ma_channel_map_copy_or_default(pDevice->capture.channelMap, ma_countof(pDevice->capture.channelMap), pConfig->capture.pChannelMap, pConfig->capture.channels);
     pDevice->capture.channelMixMode      = pConfig->capture.channelMixMode;
     pDevice->capture.calculateLFEFromSpatialChannels = pConfig->capture.calculateLFEFromSpatialChannels;
 
     pDevice->playback.shareMode          = pConfig->playback.shareMode;
     pDevice->playback.format             = pConfig->playback.format;
     pDevice->playback.channels           = pConfig->playback.channels;
-    ma_channel_map_copy_or_default(pDevice->playback.channelMap, ma_countof(pDevice->playback.channelMap), pConfig->playback.pChannelMap, pConfig->playback.channels);
     pDevice->playback.channelMixMode     = pConfig->playback.channelMixMode;
     pDevice->playback.calculateLFEFromSpatialChannels = pConfig->playback.calculateLFEFromSpatialChannels;