Refactoring: cleanup agents_static