clean up and more statsd