diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index 73659fe66c2bec7b756b3db7049ca65d14f8ef4c..613080582c687e06732d0c9ba2787e98c1310806 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -36,7 +36,6 @@ libaudio_la_SOURCES = \
 		dtmfgenerator.cpp \
 		tonegenerator.cpp \
 		codecDescriptor.cpp \
-		samplecache.cpp \
 		audioloop.cpp \
 		ringbuffer.cpp \
 		$(SPEEX_SOURCES_CPP)
@@ -55,7 +54,6 @@ noinst_HEADERS = \
 		audiodevice.h \
  		dtmfgenerator.h \
 		tonegenerator.h \
-		samplecache.h \
  		codecDescriptor.h \
 		dtmf.h \
 		tone.h 
diff --git a/src/audio/samplecache.cpp b/src/audio/samplecache.cpp
deleted file mode 100644
index 7f73642506ed1b71e3b12187847d4e8910b62f9b..0000000000000000000000000000000000000000
--- a/src/audio/samplecache.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (C) 2008 Savoir-Faire Linux inc.
- *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <samplecache.h>
-
-SampleCache::SampleCache( pa_stream* s ):_stream(s)
-{
-  //_stream = s ;
-}
-
-SampleCache::~SampleCache()
-{
-  //delete _pulse;
-}
-
-bool
-SampleCache::uploadSample( SFLDataFormat* buffer UNUSED, size_t size UNUSED )
-{
-  //pa_stream_write( pulse->caching , buffer , size  , pa_xfree, 0 , PA_SEEK_RELATIVE);
-  //pa_stream_finish_upload( pulse->caching );
-  return true;
-}  
diff --git a/src/audio/samplecache.h b/src/audio/samplecache.h
deleted file mode 100644
index 4c07d558b4e0b0f9c421376e0136a32462dc0f67..0000000000000000000000000000000000000000
--- a/src/audio/samplecache.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (C) 2008 Savoir-Faire Linux inc.
- *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SAMPLE_CACHE_H
-#define _SAMPLE_CACHE_H
-
-#include <pulse/pulseaudio.h>
-#include <audiolayer.h>
-
-class SampleCache {
- 
-  public:
-    SampleCache( pa_stream* stream );
-    ~SampleCache();
-
-
-    bool uploadSample( SFLDataFormat* buffer, size_t size );
-    bool removeSample( );
-    bool isSampleCached( );
-
-  private:
-    // Copy Constructor
-    SampleCache(const SampleCache& rh);
-
-    // Assignment Operator
-    SampleCache& operator=( const SampleCache& rh);
-
-    pa_stream* _stream;
-
-};
-
-#endif // _SAMPLE_CACHE_H