Agent clean up almost done