Stop explicitly assigning router everywhere