Further Cleanup of AutoRouter Foo