DataCollector, ServerApplication: Some clean up