diff --git a/docs/MonascaMetrics.md b/docs/MonascaMetrics.md
index 3d2d35a8..4a0049b8 100644
--- a/docs/MonascaMetrics.md
+++ b/docs/MonascaMetrics.md
@@ -165,12 +165,6 @@ Here are some examples of how code can be instrumented using calls to monasca-st
 		With dimensions:
 		statsd.gauge('users_online', 91, dimensions={'Origin': 'Dev', 'Environment': 'Test'})
 
-    * Sample a histogram.
-		statsd.histogram('file.upload_size', 20456)
-
-		With dimensions:
-		statsd.histogram('file.upload_size', 20456, sample_rate=0.5, dimensions={'Name': 'MyFile.pdf', 'Version': '1.0'})
-
     * Time a function call.
 		@statsd.timed('page.render')
 		def render_page():
@@ -184,4 +178,4 @@ Here are some examples of how code can be instrumented using calls to monasca-st
 ```
 
 # License
-(C) Copyright 2015 Hewlett Packard Enterprise Development Company LP
+(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
diff --git a/monasca_agent/collector/checks/check.py b/monasca_agent/collector/checks/check.py
index f19e6a5b..bb631d95 100644
--- a/monasca_agent/collector/checks/check.py
+++ b/monasca_agent/collector/checks/check.py
@@ -137,48 +137,6 @@ class AgentCheck(util.Dimensions):
                                       device_name,
                                       value_meta)
 
-    def histogram(self, metric, value, dimensions=None, delegated_tenant=None,
-                  hostname=None, device_name=None, value_meta=None):
-        """Sample a histogram value, with optional dimensions, hostname and device name.
-
-        :param metric: The name of the metric
-        :param value: The value to sample for the histogram
-        :param dimensions: (optional) A dictionary of dimensions for this metric
-        :param delegated_tenant: (optional) Submit metrics on behalf of this tenant ID.
-        :param hostname: (optional) A hostname for this metric. Defaults to the current hostname.
-        :param device_name: (optional) The device name for this metric
-        :param value_meta: Additional metadata about this value
-        """
-        self.aggregator.submit_metric(metric,
-                                      value,
-                                      metrics_pkg.Histogram,
-                                      dimensions,
-                                      delegated_tenant,
-                                      hostname,
-                                      device_name,
-                                      value_meta)
-
-    def set(self, metric, value, dimensions=None, delegated_tenant=None,
-            hostname=None, device_name=None, value_meta=None):
-        """Sample a set value, with optional dimensions, hostname and device name.
-
-        :param metric: The name of the metric
-        :param value: The value for the set
-        :param dimensions: (optional) A dictionary of dimensions for this metric
-        :param delegated_tenant: (optional) Submit metrics on behalf of this tenant ID.
-        :param hostname: (optional) A hostname for this metric. Defaults to the current hostname.
-        :param device_name: (optional) The device name for this metric
-        :param value_meta: Additional metadata about this value
-        """
-        self.aggregator.submit_metric(metric,
-                                      value,
-                                      metrics_pkg.Set,
-                                      dimensions,
-                                      delegated_tenant,
-                                      hostname,
-                                      device_name,
-                                      value_meta)
-
     def get_metrics(self, prettyprint=False):
         """Get all metrics, including the ones that are tagged.
 
diff --git a/monasca_agent/collector/checks_d/sqlserver.py b/monasca_agent/collector/checks_d/sqlserver.py
index 771d8322..e905d5df 100644
--- a/monasca_agent/collector/checks_d/sqlserver.py
+++ b/monasca_agent/collector/checks_d/sqlserver.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2015 Hewlett Packard Enterprise Development Company LP
+# (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
 """Check the performance counters from SQL Server.
 
 """
@@ -8,7 +8,7 @@ from monasca_agent.collector.checks import AgentCheck
 
 
 ALL_INSTANCES = 'ALL'
-VALID_METRIC_TYPES = ('gauge', 'rate', 'histogram')
+VALID_METRIC_TYPES = ('gauge', 'rate')
 
 
 class SQLServer(AgentCheck):