Remove more unused collectors