Merge "Remove dead code in statsd"