Revert "Simple agent"

This reverts commit 1db1232f334c059334398830e4df78a9ee535245.