diff --git a/include/Mixer.h b/include/Mixer.h
index d2bf15864..e46cbabe4 100644
--- a/include/Mixer.h
+++ b/include/Mixer.h
@@ -421,40 +421,35 @@ private:
 	int m_writeBuffer;
 	int m_poolDepth;
 
-	surroundSampleFrame m_maxClip;
-	surroundSampleFrame m_previousSample;
-	fpp_t m_halfStart[SURROUND_CHANNELS];
-	bool m_oldBuffer[SURROUND_CHANNELS];
-	bool m_newBuffer[SURROUND_CHANNELS];
-
+	// worker thread stuff
 	QVector<MixerWorkerThread *> m_workers;
 	int m_numWorkers;
-	QWaitCondition m_queueReadyWaitCond;
-
-	PlayHandleList m_newPlayHandles;	// place where new playhandles are added temporarily
-	QMutex m_playHandleMutex;			// mutex used only for adding playhandles
 
+	// playhandle stuff
 	PlayHandleList m_playHandles;
+	PlayHandleList m_newPlayHandles;	// place where new playhandles are added temporarily
 	ConstPlayHandleList m_playHandlesToRemove;
 
+
 	struct qualitySettings m_qualitySettings;
 	float m_masterGain;
 
-
+	// audio device stuff
 	AudioDevice * m_audioDev;
 	AudioDevice * m_oldAudioDev;
 	QString m_audioDevName;
 
-
+	// MIDI device stuff
 	MidiClient * m_midiClient;
 	QString m_midiClientName;
 
-
+	// mutexes
 	QMutex m_globalMutex;
 	QMutex m_inputFramesMutex;
-
+	QMutex m_playHandleMutex;			// mutex used only for adding playhandles
 	QMutex m_playHandleRemovalMutex;
 
+	// FIFO stuff
 	fifo * m_fifo;
 	fifoWriter * m_fifoWriter;
 
diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
index a9da761f5..e168d195b 100644
--- a/src/core/Mixer.cpp
+++ b/src/core/Mixer.cpp
@@ -68,7 +68,6 @@ Mixer::Mixer( bool renderOnly ) :
 	m_writeBuf( NULL ),
 	m_workers(),
 	m_numWorkers( QThread::idealThreadCount()-1 ),
-	m_queueReadyWaitCond(),
 	m_qualitySettings( qualitySettings::Mode_Draft ),
 	m_masterGain( 1.0f ),
 	m_audioDev( NULL ),