diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index aff8406897..b12c48ef82 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -46,7 +46,6 @@
 #include <Transform.h>
 
 #include "PositionalAudioStream.h"
-#include "AudioHelpers.h"
 #include "AudioClientLogging.h"
 #include "AudioLogging.h"
 
@@ -145,6 +144,10 @@ static void channelDownmix(int16_t* source, int16_t* dest, int numSamples) {
     }
 }
 
+static inline float convertToFloat(int16_t sample) {
+    return (float)sample * (1 / 32768.0f);
+}
+
 AudioClient::AudioClient() :
     AbstractAudioInterface(),
     _gate(this),
@@ -1201,7 +1204,7 @@ bool AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
                     // stereo gets directly mixed into mixBuffer
                     float gain = injector->getVolume();
                     for (int i = 0; i < AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; i++) {
-                        mixBuffer[i] += (float)_localScratchBuffer[i] * (1/32768.0f) * gain;
+                        mixBuffer[i] += convertToFloat(_localScratchBuffer[i]) * gain;
                     }
                     
                 } else {
@@ -1652,7 +1655,9 @@ qint64 AudioClient::AudioOutputIODevice::readData(char * data, qint64 maxSize) {
         AudioRingBuffer::ConstIterator lastPopOutput = _receivedAudioStream.getLastPopOutput();
         lastPopOutput.readSamples(scratchBuffer, networkSamplesPopped);
 
-        convertToMix(mixBuffer, scratchBuffer, networkSamplesPopped);
+        for (int i = 0; i < networkSamplesPopped; i++) {
+            mixBuffer[i] = convertToFloat(scratchBuffer[i]);
+        }
 
         samplesRequested = networkSamplesPopped;
     }
diff --git a/libraries/shared/src/AudioHelpers.h b/libraries/shared/src/AudioHelpers.h
index c891876648..b43764ef5d 100644
--- a/libraries/shared/src/AudioHelpers.h
+++ b/libraries/shared/src/AudioHelpers.h
@@ -91,16 +91,4 @@ static inline float unpackFloatGainFromByte(uint8_t byte) {
     return gain;
 }
 
-static inline void convertToMix(float* mixBuffer, const int16_t* scratchBuffer, int numSamples) {
-    for (int i = 0; i < numSamples; i++) {
-        mixBuffer[i] = (float)scratchBuffer[i] * (1/32768.0f);
-    }
-}
-
-static inline void convertToScratch(int16_t* scratchBuffer, const float* mixBuffer, int numSamples) {
-    for (int i = 0; i < numSamples; i++) {
-        scratchBuffer[i] = (int16_t)(mixBuffer[i] * 32768.0f);
-    }
-}
-
 #endif // hifi_AudioHelpers_h