Replaced sample.wav
Removed redundant USING/HAVE defines