Cleanup to get working, eliminate queue rrd