Still cleaning up agent receiver apis