Clean up GatheringHandler.cs