Clean up GraphiteDataWriter groups, close #970