Cleaned up Candidate, Stream and Agent.