Removed Agent class.
Some code cleanup