1. Removed obsolete mocks.  2.  Simplified email server interaction from mq agents.  3.  Changes mq agent task collections to factory methods.