collector: removed collector for complete rehaul