removed final traces of old alternate router experiment
Merge remote-tracking branch 'davis/develop' into develop