Removed Unnecessary Magic From WaveMan