server: Kill off some dead code
slave: Kill off some dead code