common: agents - added initial clean up