Cleanup: removed unused agents
Updated Makefile
Merge pull request #140 from mchf/master

Cleanup: removed unused agents