It removed the Collector class from the model (close #23).