diff --git a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
index df3ebdbbb0..ca5a8df7a0 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
@@ -59,13 +59,13 @@ const int		kOffPacketReset = (int) (kOffPacketLimit / 100);			// Reset when with
 const int		kBuffersInRing = 3;
 
 // VRB Chunk Header
-struct VRBChunkHeader
+typedef struct VRBChunkHeader
 {
 	int sample;			// Sample-number for chunk
 	size_t offset;		// Offset into the chunk for live data (normally 0)
 	size_t length;		// Length of live data within the chunk
-};
-typedef struct VRBChunkHeader	VRBChunkHeader;
+} VBRChunkHeader;
+
 
 #define FEEDER_THREAD_IMPORTANCE 6
 // Additional priority to use for the feeder thread, on top of this task's ordinary priority.
@@ -188,14 +188,8 @@ void RageSound_CA::FeederThread()
 // ----------------------------------------------------------------------
 
 
-RageSound_CA::RageSound_CA()
-: idealFormat(NULL)
-, actualFormat(NULL)
-, converter(NULL)
+RageSound_CA::RageSound_CA() : idealFormat(NULL), actualFormat(NULL), converter(NULL)
 {
-#if (DRIVER == DRIVER_UNFINISHED)
-    RageException::ThrowNonfatal("Class not finished");
-#endif
 
 	shutdown = false;
 
@@ -800,14 +794,7 @@ OSStatus RageSound_CA::OverloadListener(AudioDeviceID inDevice, UInt32 inChannel
 	return 0;
 }
 
-
-/*int64_t RageSound_CA::ConvertSampleTimeToPosition(const Float64 sampleTime) const
-{
-	return  int64_t(sampleTime - startSampleTime);
-}*/
-
 int64_t RageSound_CA::ConvertAudioTimeStampToPosition(const AudioTimeStamp *time) const
 {
-	//return this->ConvertSampleTimeToPosition(time->mSampleTime);
     return int64_t(time->mSampleTime - startSampleTime);
 }
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_CA.h b/stepmania/src/arch/Sound/RageSoundDriver_CA.h
index 9a06f8df97..e44f58acc5 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_CA.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_CA.h
@@ -15,11 +15,6 @@
 #include "RageSoundDriver.h"
 #include "RageThreads.h"
 
-
-#define DRIVER_UNFINISHED 		0
-#define DRIVER_HAL				1
-#define DRIVER 					DRIVER_HAL
-
 #define FEEDER_DIRECT			0
 #define FEEDER_THREAD			1
 #define FEEDER					FEEDER_DIRECT
@@ -95,7 +90,6 @@ private:
 	void FeederThread();
 #endif
 
-    //int64_t ConvertSampleTimeToPosition(const Float64 sampleTime) const;
     int64_t ConvertAudioTimeStampToPosition(const AudioTimeStamp *time) const;
 
 protected: