rpearce: Final clean up of bind cluster/server code