refactor slave to agent where possible

[Joe Stein]

the use of slave is being deprecated for agent and we should try to not build any new code with it, saves time later and lets refactor now too some