Clean and new Collector Classes