diff --git a/.gitignore b/.gitignore
index f6cd356..a3ee3d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 */tmp/*
 *.hwm*
 *.cfg
+*.out
 .svn
 build
 bin
diff --git a/include/serial/serial_listener.h b/include/serial/serial_listener.h
index 23ca918..43a3fff 100644
--- a/include/serial/serial_listener.h
+++ b/include/serial/serial_listener.h
@@ -140,15 +140,6 @@ _delimeter_tokenizer (std::string &data, std::vector<std::string> &tokens,
  * 
  * \see SerialListener::setTokenizer, serial::TokenizerType
  */
-class delimeter_tokenizer
-{
-public:
-  delimeter_tokenizer ();
-  virtual ~delimeter_tokenizer ();
-
-private:
-  /* data */
-};
 TokenizerType
 delimeter_tokenizer (std::string delimeter);
 
diff --git a/src/serial_listener.cc b/src/serial_listener.cc
index 32994f9..095db07 100644
--- a/src/serial_listener.cc
+++ b/src/serial_listener.cc
@@ -31,7 +31,8 @@ _delimeter_tokenizer (std::string &data, std::vector<std::string> &tokens,
 
 TokenizerType
 delimeter_tokenizer (std::string delimeter) {
-  return boost::bind(_delimeter_tokenizer, _1, _2, delimeter);
+  TokenizerType temp = boost::bind(_delimeter_tokenizer, _1, _2, delimeter);
+  return temp;
 }
 
 /***** Listener Class Functions *****/
diff --git a/tests/proof_of_concepts/tokenizer.cc.out b/tests/proof_of_concepts/tokenizer.cc.out
deleted file mode 100755
index 1c51937..0000000
Binary files a/tests/proof_of_concepts/tokenizer.cc.out and /dev/null differ