Finish router changes and change clients to use router configs instead of pids