Still cleaning up old agent calls