Removed unused util classes
The collectorhandler uses a sortedset for the files
teardown and cleanup for the integration test