Removing unneeded CollectorThread
Single Collector thread rework