remove duplicate classes between agent/core
minor cleanup
update