Merge "Remove TODOs from create_router.py"