Removed obsolete class
Agent nearly finished
Merge