Agent class clean up halfway