removed domain dependency from agent