Merge "Remove _get_router & _create_router methods"