diff --git a/requirements.txt b/requirements.txt
index 7cbcac0..2fa4859 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
-ConfigParser
 python-statsd
diff --git a/setup.cfg b/setup.cfg
index a870ace..f8f58a6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,6 @@ classifier=
 [files]
 packages =
     monascastatsd
-    statsd-generator
 
 [global]
 setup-hooks =
diff --git a/statsd-generator/README.md b/statsd-generator/README.md
deleted file mode 100644
index ec1279c..0000000
--- a/statsd-generator/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Python Monasca-statsd Generator
-
-This test tool will create monasca-statsd metrics and send them to the monitoring agent.
-To use it, you will need to install the following python libraries:
-```
-sudo apt-get install python-setuptools
-sudo pip install monasca-statsd
-```
-
-## Usage
-### To run the generator:
-```
-1) edit the config file (generator.conf) and set the target host, port, number of
-iterations and delay (in seconds) between iterations.
-2) cd to the statsd-generator directory
-3) Type ./generator.py
-4) The tool will send 4 different types of monasca-statsd messages to the monitoring
-agent and then sleep for the duration of the delay and then will continue to the
-next iteration until the number of iterations is reached.
-```
\ No newline at end of file
diff --git a/statsd-generator/__init__.py b/statsd-generator/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/statsd-generator/generator.conf b/statsd-generator/generator.conf
deleted file mode 100644
index 6105fc9..0000000
--- a/statsd-generator/generator.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[main]
-iterations: 5
-delay: 3
-host: localhost
-port: 8125
diff --git a/statsd-generator/generator.py b/statsd-generator/generator.py
deleted file mode 100755
index 8c9f4af..0000000
--- a/statsd-generator/generator.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/python
-# (C) Copyright 2014 Hewlett Packard Enterprise Development Company LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import ConfigParser
-import random
-import time
-
-import monascastatsd as mstatsd
-
-import statsd
-
-'''The statsd generator will provide a testbed for testing
-
-the monasca agent statsd capability with dimensions
-'''
-
-
-class MonascaStatsdGenerator(object):
-
-    '''Class to generate MonascaStatsd metrics.'''
-
-    def __init__(self, config):
-        '''Constructor.'''
-        print (config)
-        self.num_of_iterations = int(config["iterations"])
-        self.delay = int(config["delay"])
-        self.host = config["host"]
-        self.port = config["port"]
-
-    def send_messages(self):
-        '''Main processing for sending messages.'''
-        try:
-            conn = mstatsd.Connection(host=self.host, port=self.port)
-            self.client = mstatsd.Client(name='statsd-generator', connection=conn)
-            for index in range(1, self.num_of_iterations + 1):
-                print("Starting iteration " + str(index) +
-                      " of " + str(self.num_of_iterations))
-                counter = self.client.get_counter('teraflops')
-                counter.increment(5)
-                gauge = self.client.get_gauge()
-                gauge.send('num_of_teraflops',
-                           random.uniform(1.0, 10.0),
-                           dimensions={'origin': 'dev',
-                                       'environment': 'test'})
-                histogram = self.client.get_histogram('hist')
-                histogram.send('file.upload.size',
-                               random.randrange(1, 100),
-                               dimensions={'version': '1.0'})
-                set = self.client.get_set('hist')
-                set.send('load_time',
-                         random.randrange(1, 100),
-                         dimensions={'page_name': 'mypage.html'})
-
-                timer = self.client.get_timer('timer')
-
-                @timer.timed('config_db_time',
-                             dimensions={'db_name': 'mydb'})
-                def time_db():
-                    time.sleep(0.2)
-                time_db()
-
-                with timer.time('time_block'):
-                    time.sleep(0.3)
-
-                # Send some regular statsd messages
-                counter = statsd.Counter('statsd_counter')
-                counter += 1
-                gauge = statsd.Gauge('statsd_gauge')
-                gauge.send('cpu_percent',
-                           random.uniform(1.0, 100.0))
-                print("Completed iteration " + str(index) +
-                      ".  Sleeping for " + str(self.delay) + " seconds...")
-                time.sleep(self.delay)
-        except Exception:
-            print ("Error sending statsd messages...")
-            raise
-
-
-def read_config():
-    '''Read in the config file.'''
-    config = ConfigParser.ConfigParser()
-    config.read("generator.conf")
-    config_options = {}
-    section = "main"
-    options = config.options(section)
-    for option in options:
-        try:
-            config_options[option] = config.get(section, option)
-            if config_options[option] == -1:
-                print("skip: %s" % option)
-        except Exception:
-            print("exception on %s!" % option)
-            config_options[option] = None
-    return config_options
-
-
-def main():
-    config = read_config()
-    generator = MonascaStatsdGenerator(config)
-    generator.send_messages()
-
-if __name__ == "__main__":
-    main()